Comments, small fixes