Bug fixes and prepared to convert into a Wordpress plugin for use within ACF v4