fixes to 1st release

few bug fixes