added some aliases, etc...