lots of bugs fixes, and bump version