Cleanup & fixes in preparation for submission to wordpress.org plugins directory