CS and bug fixes
cleanup