cleaned up and added new plugins