more improvements on syntax and addition of more constants