fix errors
fix errors and clean