some syntax fix + config modifications