Agent says I will play gray.

+ cleanups, small fixes