More comments

Too busy to work on this...