Fix typos, remove backup files