Fixes, added ability to add plugins thanks to zack.