small fixes, hww to be included in next iteration
small fixes, hww to be included in next iteration