cleanup
working on errors