fixed a couple of CS issues