moved code to test or improve in extras.php and cleaned up shortcode and other functions