Bug fixes, spelling error fix.