final cs fixes, I think