Fixing some issues to do with unary operators following conditionals -- still not fully understood -- and some whitespace tweaks