lots of changes

not sure what they are at this point, but savepoint added