update to fix , no longer existent plugins via github. Also did some code clean up.