cleanup
make everything work