more fix fixing and regen