Various changes
Removed dummy print statements
Merge pull request #25 from kyleabeauchamp/fixes

[WIP] Various Fixes