More updates

Trying to clean up some race conditions
Adding colors