a few updates
lots of updates
Cleaned up plugins