Removed a great deal of log-comments
Greatly improved performance

Also did some testing and comparison

refs #26 @2h00