added aliases, fix plugins