Bug fixes
Took out debug printf