Little tweaks.
Switch to using some natives within the base plugin itself.