Bug fixes. Fixes #26
Commented out code that was breaking things for a quick fix...