fixed some cs issues