Version bump- bug fixes