improved, added some basic plugins