better colors, fixed analysis bug