repush of minor tweaks and changed scripts