CS fixes and experiments...