syntax updating, hot fixes