Add comments, UI tweaks.