Spacing and bugfixes
Merge pull request #2 from Meatballs1/pr2107

Spacing and bugfixes