Fix errors ; clean up