wp.org fixes and fixed fatall error from wp product review