Credit Andrew - minor bug fixes and plugin update