cleanup logging
Improve plugin loading