added some aliases and fiddled with functions