Horsepill fixes, typos, etc.