Syncing submodules, mostly adding comments at various places