Put them in the right place
Fix mistakes