clean up format
new plugin, minor fixes