Comments and Username fix

All good!!