Various CS

(not ready to merge)