Fixed commenting and minor CSS details