Comments - fixed lots o stuffs