Some more small bugfixes and significant updates to submodules