Comments, removed dead code, cleaned up some existing bits.