left some scripts in an inconsistent state, fixed up so everything is working again