Review + CS fixes