Update submodules
Assorted cleanup