00.30.20.140814

* Lots of Code and comment clean-up and optimization