Cleanup

Fixed bug in *calc and in admin portion and cleaned up the code a little
bit. Removed much of the debugging text as this was becoming too
cluttered in console.