Spell check
Small sorting
Small changes
Annoying bug are FIXED
Merge pull request #18 from Wohlstand/master

Update from Wohlstand's repo