Clean up comments. Robustify user interface.