Tweak to script order and update submods