Version reverse, bug fixes