fixed constants, identifiers, keywords, formatting, desugaring of : for primitive to ->
merged from gsdlab/develop