General bug fixes

No <!-- breakages, no white space messages