Added Rollbacks, bug fixes