More comments and small changes