minor (but a lot of) syntax fixes