fixed concurrency issues and added colors