Add more aliases and config tweaks