Clean up some files and fix some typos