Tweak aliases and update
Update submodules