A few bug fixes and spelling corrections.