added a few changes, plugins