More comments, small fixes