Added missing logging switch, added corrected support to make file, increased logging sqlite timeout