various changes with thoughts annotated in HTML comments