Final Touches (resync)

Commenting, code optimization, few GUI fixes
Iteration fixes, useless code removed