Crash fix and better colors