some rollback and fixes