Minior Bugfix
Closes #24

Various Bugfixes