Commit 3

Changes to program output and cleaned up a bit.