Fixed typos and calls.
Tweaked plugin functions.
Updated to call to new module.