Fixed general failings with everything. Fixes #211.

My editor fixed some extra tabs in globals.