Submod update and script tweak