Added initial unalias and improved which