fix and add some aliases
fix