* Commenting, varnaming, fix indent

* commenting and adjusting debug output
* more descriptive varnaming