Fixing bugs in output
Merge pull request #72 from cgoodling/kaley

Fixing bugs in output