Fixes #104 - Also fixes style issues and loading bug.

#104