Misc Changes and Added diff support fixes