CS Fixes And Minor Tweaks