Threading improvements and some exception handling removed until further testing