Minor changes & new aliases