Clean up comment
Upgrade submodules to latest versions