killed the bugs that arose from the bugfixes :D
Merge branch 'develop'