bug fixes and add plugins