More aliases and tweaks
Fixed submodules