Added full concurrency support, some cleanup