moar cs fixes
moar cs fixes