Bug and typo fixes

[zvonler]

Had a lot of fun doing these, noticed these small errors and wanted to contribute fixes.

Mostly whitespace changes, a couple of typo fixes, and one actual bugfix ("else if" -> "elseif").