another pass and cleaning up and expanind all CS definitions