script seems to have worked, good middle point for running it before updating all the code. #587 fixes from separating modelforms.
made some updates to code; need testing. #587