added some aliases, minor tweak here and there