Many small fixes and a version bump