disambiguate constants from variables, couple fixes