Add a few aliases
imrpove separate logic; a few minor modifications