commitfix & bugfixes

issues were closed in previous commit!
#14, #16 and #17