plug minor fixes
Merge pull request #72 from cordoval/minor-fixes-again

plug minor fixes