More comments and other minoe changes