master: Cleanup, moving towards compilability, making class comment more uniform.