Cosmetic updates & HTML comments describing ToDos