bug fixes - first successfull prerelease