a lot of small tweaks to the syntax