Rollback handler, some status-bar updates
hacky fixes