bugfixes

closes #23 
closes #24 
closes #25