clean up similar and fix errors