Corrected Comments and certain GUI structures.