Cleanup, infections, better colors