Merge pull request #1 from MawKKe/master

Various small fixes
Minor cleanups.