fixed some CS issues