Fix typos, cleanup...