a few tweaks and aliases