some bugfixes, refactoring
Merge branch 'master' of github.com:Danny02/DarwinsBox