Fix's CS is done. Let me know if anything needs to be tweaked.