added some more aliases and exports