boiler plate and test improved
Moved syntax in line with other langs and improved multline string
minor comments