New aliases
Fix some aliases
Minor tweaks