Some minor tweaks and bug fixing. Still no progress on the syntax issue