1st batch of scopatz changes