new aliases
fixed exports