cleanup apostrophe and normalize
put explicit rollback back in
more cleanup