bugfixes
closes #68
probably fixing #37