Issues 6 & 10

* Correct operator ordering in conditional, thanks Dan!