More comments. Also removed dead code.