Removed some bugs
Fixes #35