Stylecop fixes and some settings that will change in feature