updates
shutdown sequence fixes
api changes
test fixes