syntax updates

This fixes #1, along with some other syntax issues