Added various changes
Added update_alias function to tidy add_alias
Hotfix: Merge fixes