Minor syntax fixes and UI mods