Fixed Threading Issue, etc.