#22 syntax corrections