small changes, starting work on the plugin handler again