Bug Fixes. Threading Removed