Minor improvements & updated submodules.