Update comments, small fixes