Some performance improvement;
Fixed wait for color block segfault