commenting code, small fixes