Removed extra test code and added a bit of logging
Added a few more stats
Learned that you don't need File::SEPERATOR
Moved to 2 spaces instead of 4
Merged