Comments edited.

Some TODO GUI comments stated and some are removed.