General changes ready for Wordpress submission