Comments, code cleanup, icons in help page