comments, small fixes