bug fixes and bump version