minor changes all around
Merge branch 'master' of github.com:Shade4e/webtek