various cleanup
work on transfer