new aliases, other tweaks