clean up files and squash bugs