More comments, improved look-and-feel