Bug Fixes

closes #53
closes #54