Corrects some minor issues
Polishes plugin prototype