update comments
more tidying up