cleanup
fix errors