accepting changes, small fixes, removing old comments