Fixing bunch of style and syntatx errors

Also actually including the config classes in init