made the most obvious and quickest bug fixes
cleaned up the output page
Merge pull request #1 from fcwheat/master

made the most obvious and quickest bug fixes