Cleaned up plugins a bit.