Couple changes made, mostly testing