Fixed commenting
Fixed commenting
added widgets
More formatting changes
Merging?