syntax improvements and shizzle