Changed variable order in Syntax.variables; Some small changes.