Minor bug fixes and spelling suggestion code.