fix and add aliases, plugins