Some cleaning

Removed some comments spacing.  Added some notes on some remaining
comments <DEBUG>