Fix error output
Redo plugin system