diff --git a/admin/em-admin.php b/admin/em-admin.php
index 6c38254..e4b0b0d 100644
--- a/admin/em-admin.php
+++ b/admin/em-admin.php
@@ -256,25 +256,44 @@ function em_updates_check( $transient ) {
         
     //only bother if we're checking for dev versions
     if( get_option('em_check_dev_version') || get_option('dbem_pro_dev_updates') ){     
-	    //check WP repo for trunk version
-	    $request = wp_remote_get('https://plugins.svn.wordpress.org/events-manager/trunk/events-manager.php');
-	    
-	    if( !is_wp_error($request) ){
-		    preg_match('/Version: ([0-9a-z\.]+)/', $request['body'], $matches);
-		    
-		    if( !empty($matches[1]) ){
-		    	//we have a version number!
-			    if( version_compare($transient->checked[EM_SLUG], $matches[1]) < 0) {
-			    	$response = new stdClass();
-			    	$response->slug = EM_SLUG;
-					$response->new_version = $matches[1] ;
-			        $response->url = 'http://wordpress.org/extend/plugins/events-manager/';
-				    $response->package = 'http://downloads.wordpress.org/plugin/events-manager.zip';
-			       	$transient->response[EM_SLUG] = $response;
+	    //check WP repo for trunk version, other EM-related plugins on .org can hook here to make the best of our admin setting option
+	    $plugins = apply_filters('em_org_dev_versions', array(
+	    	'events-manager'=> array(
+	    		'slug' => EM_SLUG,
+			    'version' => EM_VERSION
+		    )
+		));
+	    foreach( $plugins as $org_slug => $plugin_info ) {
+		    $request = wp_remote_get('https://plugins.svn.wordpress.org/'.$org_slug.'/trunk/'.$org_slug.'.php');
+		    $wp_slug = $plugin_info['slug'];
+		    if( empty($transient->checked[$wp_slug]) ){
+			    $transient->checked[$wp_slug] = !empty($plugin_info['version']) ? $plugin_info['version'] : 0;
+		    }
+		    if (!is_wp_error($request)) {
+			    preg_match('/Version: ([0-9a-z\.]+)/', $request['body'], $matches);
+			
+			    if (!empty($matches[1])) {
+				    //we have a version number!
+				    $response = new stdClass();
+				    $response->slug = $wp_slug;
+				    $response->new_version = $matches[1];
+				    $response->url = 'http://wordpress.org/extend/plugins/'.$org_slug.'/';
+				    $response->package = 'http://downloads.wordpress.org/plugin/'.$org_slug.'.zip';
+				    $icon_test = wp_remote_get('https://ps.w.org/'.$org_slug.'/assets/icon-128x128.png');
+				    if( !is_wp_error($icon_test) && $icon_test['response']['code'] == 200 ){
+					    $response->icons = array(
+					        '1x' => 'https://ps.w.org/'.$org_slug.'/assets/icon-128x128.png',
+					        '2x' => 'https://ps.w.org/'.$org_slug.'/assets/icon-256x256.png'
+					    );
+					}
+				    if ( version_compare($transient->checked[$wp_slug], $matches[1]) < 0) {
+					    $transient->response[$wp_slug] = $response;
+				    }else{
+					    $transient->no_update[$wp_slug] = $response;
+				    }
 			    }
 		    }
-		}
-		
+	    }
 		delete_option('em_check_dev_version');
     }
     
diff --git a/admin/em-bookings.php b/admin/em-bookings.php
index ebbc356..57b74e9 100644
--- a/admin/em-bookings.php
+++ b/admin/em-bookings.php
@@ -186,6 +186,7 @@ function em_bookings_single(){
 		<?php
 		return false;
 	}
+	do_action('em_booking_admin', $EM_Booking);
 	?>
 	<div class='wrap' id="em-bookings-admin-booking">
 		<?php if( is_admin() ): ?><h1><?php else: ?><h2><?php endif; ?>		
@@ -239,11 +240,11 @@ function em_bookings_single(){
 						</form>
 						<script type="text/javascript">
 							jQuery(document).ready( function($){
-								$('#em-booking-person-modify').click(function(){
+								$('#em-booking-person-modify').on('click', function(){
 									$('.em-booking-person-details').hide();
 									$('.em-booking-person-editor').show();
 								});
-								$('#em-booking-person-modify-cancel').click(function(){
+								$('#em-booking-person-modify-cancel').on('click', function(){
 									$('.em-booking-person-details').show();
 									$('.em-booking-person-editor').hide();
 								});
@@ -424,22 +425,22 @@ function em_bookings_single(){
 						</form>
 						<script type="text/javascript">
 							jQuery(document).ready( function($){
-								$('#em-booking-submit-modify').click(function(){
+								$('#em-booking-submit-modify').on('click', function(){
 									$('.em-booking-single-info').hide();
 									$('.em-booking-single-edit').show();
 								});
-								$('#em-booking-submit-cancel').click(function(){
+								$('#em-booking-submit-cancel').on('click', function(){
 									$('.em-booking-single-info').show();
 									$('.em-booking-single-edit').hide();
 								});
 								$('.em-booking-single-info').show();
 								$('.em-booking-single-edit').hide();
 
-								$('#em-booking-submit-status-modify').click(function(){
+								$('#em-booking-submit-status-modify').on('click', function(){
 									$('.em-booking-single-status-info').hide();
 									$('.em-booking-single-status-edit').show();
 								});
-								$('#em-booking-submit-status-cancel').click(function(){
+								$('#em-booking-submit-status-cancel').on('click', function(){
 									$('.em-booking-single-status-info').show();
 									$('.em-booking-single-status-edit').hide();
 								});
@@ -447,6 +448,7 @@ function em_bookings_single(){
 								$('.em-booking-single-status-edit').hide();
 							});
 						</script>
+						<?php do_action('em_bookings_single_details_footer', $EM_Booking); ?>
 					</div>
 				</div>
 				<div id="em-booking-notes" class="postbox">
diff --git a/admin/em-docs.php b/admin/em-docs.php
index a2edacd..5c6a36a 100644
--- a/admin/em-docs.php
+++ b/admin/em-docs.php
@@ -170,7 +170,7 @@ function em_docs_init($force_init = false){
 						'desc' => 'These placeholders will only show if bookings are enabled for the given event and in the events manager settings page. Spaces placeholders will default to 0',
 						'placeholders' => array(
 							'#_BOOKINGFORM' => array( 'desc' => 'Adds a booking forms for this event.' ),
-							'#_BOOKINGBUTTON' => array( 'desc' => 'A single button that will appear to logged in users, if they click on it, they apply for a booking. This button will only display if there is one ticket.' ),
+							'#_BOOKINGBUTTON' => array( 'desc' => 'A single button that will appear to logged in users, if they click on it a booking will be made. This button will automatically book the first aailable ticket if more than one ticket exists for the event, and will also circumvent any payment requirements. Use in combination with conditional placeholders such as is_free to avoid unpaid bookings.' ),
 							'#_AVAILABLESPACES' => array( 'desc' => 'Shows available spaces for the event.' ),
 							'#_BOOKEDSPACES' => array( 'desc' => 'Shows the amount of currently booked spaces for the event.' ),
 							'#_PENDINGSPACES' => array( 'desc' => 'Shows the amount of pending spaces for the event.' ),
diff --git a/admin/em-ms-options.php b/admin/em-ms-options.php
index 8bad0b0..1e5deba 100755
--- a/admin/em-ms-options.php
+++ b/admin/em-ms-options.php
@@ -84,7 +84,7 @@ function em_ms_admin_options_page() {
 	<script type="text/javascript" charset="utf-8">
 		jQuery(document).ready(function($){
 			//events
-			$('input[name="dbem_ms_global_events"]').change(function(){
+			$('input[name="dbem_ms_global_events"]').on('change', function(){
 				if( $('input:radio[name="dbem_ms_global_events"]:checked').val() == 1 ){
 					$("tr#dbem_ms_global_events_links_row").show();
 					$('input:radio[name="dbem_ms_global_events_links"]:checked').trigger('change');
@@ -92,7 +92,7 @@ function em_ms_admin_options_page() {
 					$("tr#dbem_ms_global_events_links_row, tr#dbem_ms_events_slug_row").hide();					
 				}
 			}).first().trigger('change');
-			$('input[name="dbem_ms_global_events_links"]').change(function(){
+			$('input[name="dbem_ms_global_events_links"]').on('change', function(){
 				if( $('input:radio[name="dbem_ms_global_events_links"]:checked').val() == 1 ){
 					$("tr#dbem_ms_events_slug_row").hide();	
 				}else{				
@@ -100,14 +100,14 @@ function em_ms_admin_options_page() {
 				}
 			}).first().trigger('change');
 			//locations
-			$('input[name="dbem_ms_mainblog_locations"]').change(function(){
+			$('input[name="dbem_ms_mainblog_locations"]').on('change', function(){
 				if( $('input:radio[name="dbem_ms_mainblog_locations"]:checked').val() == 1 ){
 					$("tbody.em-global-locations").hide();
 				}else{
 					$("tbody.em-global-locations").show();					
 				}
 			}).first().trigger('change');
-			$('input[name="dbem_ms_global_locations"]').change(function(){
+			$('input[name="dbem_ms_global_locations"]').on('change', function(){
 				if( $('input:radio[name="dbem_ms_global_locations"]:checked').val() == 1 ){
 					$("tr#dbem_ms_global_locations_links_row").show();
 					$('input:radio[name="dbem_ms_global_locations_links"]:checked').trigger('change');
@@ -115,7 +115,7 @@ function em_ms_admin_options_page() {
 					$("tr#dbem_ms_global_locations_links_row, tr#dbem_ms_locations_slug_row").hide();					
 				}
 			}).first().trigger('change');
-			$('input[name="dbem_ms_global_locations_links"]').change(function(){
+			$('input[name="dbem_ms_global_locations_links"]').on('change', function(){
 				if( $('input:radio[name="dbem_ms_global_locations_links"]:checked').val() == 1 ){
 					$("tr#dbem_ms_locations_slug_row").hide();	
 				}else{
@@ -123,7 +123,7 @@ function em_ms_admin_options_page() {
 				}
 			});		
 			//MS Mode selection hiders 
-			$('input[name="dbem_ms_global_table"]').change(function(){ //global
+			$('input[name="dbem_ms_global_table"]').on('change', function(){ //global
 				if( $('input:radio[name="dbem_ms_global_table"]:checked').val() == 1 ){
 					$("tbody.em-global-options").show();
 					$('input:radio[name="dbem_ms_mainblog_locations"]:checked').trigger('change');
diff --git a/admin/em-options.php b/admin/em-options.php
index 658fd37..d52412d 100644
--- a/admin/em-options.php
+++ b/admin/em-options.php
@@ -629,7 +629,7 @@ function em_admin_option_box_email(){
 		</table>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(document).ready(function($){
-				$('#dbem_rsvp_mail_send_method_row select').change(function(){
+				$('#dbem_rsvp_mail_send_method_row select').on('change', function(){
 					el = $(this);
 					if( el.find(':selected').val() == 'smtp' ){
 						$('.em-email-settings-smtp').show();
@@ -637,7 +637,7 @@ function em_admin_option_box_email(){
 						$('.em-email-settings-smtp').hide();
 					}
 				}).trigger('change');
-				$('input#em-admin-check-email').click(function(e,el){
+				$('input#em-admin-check-email').on('click', function(e,el){
 					var email_data = $('.em-email-form input, .em-email-form select').serialize();
 					$.ajax({
 						url: EM.ajaxurl,
@@ -837,7 +837,7 @@ function em_admin_option_box_uninstall(){
     			    </td>
 					<script type="text/javascript" charset="utf-8">
 						jQuery(document).ready(function($){
-							$('a#em-admin-import-settings').click(function(e,el){
+							$('a#em-admin-import-settings').on('click', function(e,el){
 								var thisform = $(this).closest('form');
 								thisform.find('input[type=text], textarea, select, input[type=radio], input[type=hidden]').prop('disabled', true);
 								thisform.find('input[name=_wpnonce]').val('<?php echo esc_attr($import_nonce); ?>').prop('disabled', false);
@@ -931,14 +931,14 @@ function em_admin_option_box_uninstall(){
     			    </td>
 					<script type="text/javascript" charset="utf-8">
 						jQuery(document).ready(function($){
-							$('select[name="timezone_reset_value"]').change( function( e ){
+							$('select[name="timezone_reset_value"]').on('change', function( e ){
 								if( $(this).val() == '' ){
 									$('a#em-reset-event-timezones').css({opacity:0.5, cursor:'default'});
 								}else{
 									$('a#em-reset-event-timezones').css({opacity:1, cursor:'pointer'});
 								}
 							}).trigger('change');
-							$('a#em-reset-event-timezones').click(function(e,el){
+							$('a#em-reset-event-timezones').on('click', function(e,el){
 								if( $('select[name="timezone_reset_value"]').val() == '' ) return false;
 								var thisform = $(this).closest('form');
 								thisform.find('input, textarea, select').prop('disabled', true);
diff --git a/admin/settings/tabs/general.php b/admin/settings/tabs/general.php
index 7259a70..9ccff9c 100644
--- a/admin/settings/tabs/general.php
+++ b/admin/settings/tabs/general.php
@@ -292,7 +292,7 @@
 		</table>
 		<script type="text/javascript">
 			jQuery(document).ready(function($){
-				$('input:radio[name="dbem_js_limit"]').change(function(){
+				$('input:radio[name="dbem_js_limit"]').on('change', function(){
 					if( $('input:radio[name="dbem_js_limit"]:checked').val() == 1 ){
 						$('tbody#dbem-js-limit-options').show();
 					}else{
@@ -300,7 +300,7 @@
 					}
 				}).trigger('change');
 				
-				$('input:radio[name="dbem_css_limit"]').change(function(){
+				$('input:radio[name="dbem_css_limit"]').on('change', function(){
 					if( $('input:radio[name="dbem_css_limit"]:checked').val() == 1 ){
 						$('tbody#dbem-css-limit-options').show();
 					}else{
diff --git a/admin/settings/wpfc-admin.php b/admin/settings/wpfc-admin.php
index e02f365..89523ed 100644
--- a/admin/settings/wpfc-admin.php
+++ b/admin/settings/wpfc-admin.php
@@ -42,7 +42,7 @@ function wpfc_em_install(){
 	//check for updates - try adding one option, if it works then it's a first time install so add more
 	if( current_user_can('manage_options') && get_option('dbem_emfc_full_calendar_event_format', false) ){
 	    add_option('dbem_emfc_full_calendar_event_format','#_EVENTTIMES - #_EVENTNAME');
-		add_option('dbem_emfc_qtips_format', '{has_image}<div style="float:left; margin:0px 5px 5px 0px;">#_EVENTIMAGE{75,75}</div>{/has_image}#_EVENTEXCERPT');
+		add_option('dbem_emfc_qtips_format', '{has_image}<div style="float:left; margin:5px 10px 5px 0px;">#_EVENTIMAGE{75,75}</div>{/has_image}#_EVENTEXCERPT');
 	}
 }
 add_action('init', 'wpfc_em_install');
\ No newline at end of file
diff --git a/classes/em-admin-notice.php b/classes/em-admin-notice.php
index 070f99e..22bc47a 100644
--- a/classes/em-admin-notice.php
+++ b/classes/em-admin-notice.php
@@ -56,7 +56,7 @@ class EM_Admin_Notice {
 	 */
 	public $network = false;
 	
-	public function __construct( $key, $type = false, $message = false ){
+	public function __construct( $key, $type = false, $message = false, $where = false ){
 		//process the supplied data
 		if( empty($message) ){
 			if( empty($type) && is_array($key) ){
@@ -79,6 +79,8 @@ public function __construct( $key, $type = false, $message = false ){
 		foreach( $notice as $key => $value ){
 			$this->$key = $value;
 		}
+		//add where if defined
+		if( !empty($where) ) $this->where = $where;
 		//call a hook
 		do_action('em_admin_notice_'.$this->name, $this);
 		if( !is_multisite() && $this->where == 'network_admin' ) $this->where = 'settings';
diff --git a/classes/em-booking.php b/classes/em-booking.php
index 1cb31a8..a99e469 100644
--- a/classes/em-booking.php
+++ b/classes/em-booking.php
@@ -143,7 +143,6 @@ function __construct( $booking_data = false ){
 			//Save into the object
 			$this->to_object($booking);
 			$this->previous_status = $this->booking_status;
-			$this->get_person();
 			$this->booking_date = !empty($booking['booking_date']) ? $booking['booking_date']:false;
 		}
 		//Do it here so things appear in the po file.
@@ -197,6 +196,25 @@ public function __isset( $prop ){
 		return  parent::__isset( $prop );
 	}
 	
+	/**
+	 * Return relevant fields that will be used for storage, excluding things such as event and ticket objects that should get reloaded
+	 * @return string[]
+	 */
+	public function __sleep(){
+		$array = array('booking_id','event_id','person_id','booking_price','booking_spaces','booking_comment','booking_status','booking_tax_rate','booking_taxes','booking_meta','notes','booking_date','person','feedback_message','errors','mails_sent','custom','previous_status','status_array','manage_override','tickets_bookings');
+		if( !empty($this->bookings) ) $array[] = 'bookings'; // EM Pro backwards compatibility
+		return apply_filters('em_booking_sleep', $array, $this);
+	}
+	
+	/**
+	 * Repopulate the ticket bookings with this object and its event reference.
+	 */
+	public function __wakeup(){
+		foreach($this->get_tickets_bookings()->tickets_bookings as $EM_Ticket_Booking){
+			$EM_Ticket_Booking->booking = $this;
+		}
+	}
+	
 	function get_notes(){
 		global $wpdb;
 		if( !is_array($this->notes) && !empty($this->booking_id) ){
@@ -276,6 +294,22 @@ function save($mail = true){
 		return apply_filters('em_booking_save', false, $this, false);
 	}
 	
+	/**
+	 * Update a specific key value in the booking meta data, or create one if it doesn't exist.
+	 * @param $meta_key
+	 * @param $meta_value
+	 * @return bool
+	 * @since 5.9.11
+	 */
+	public function update_meta( $meta_key, $meta_value ){
+		global $wpdb;
+		if( !$this->booking_id ) return false;
+		$this->booking_meta[$meta_key] = $meta_value;
+		$booking_meta = serialize($this->booking_meta);
+		$result = $wpdb->update( EM_BOOKINGS_TABLE, array('booking_meta' => $booking_meta), array('booking_id' => $this->booking_id) );
+		return apply_filters('em_booking_update_meta', $result !== false, $meta_key, $meta_value, $this);
+	}
+	
 	/**
 	 * Load a record into this object by passing an associative array of table criteria to search for.
 	 * Returns boolean depending on whether a record is found or not. 
@@ -361,8 +395,8 @@ function validate( $override_availability = false ){
 			foreach($this->get_tickets_bookings()->tickets_bookings as $EM_Ticket_Booking){ /* @var $EM_Ticket_Booking EM_Ticket_Booking */
 				if ( !$EM_Ticket_Booking->validate() ){
 					$ticket_validation[] = false;
-					$result = $basic && !in_array(false,$ticket_validation);
-				} else {
+					$this->errors = array_merge($this->errors, $EM_Ticket_Booking->get_errors());
+				}  else {
 					// GGG
 					$ticket_id = $EM_Ticket_Booking->ticket_id;
 					$ticket_name = EM_Ticket::get_ticket_name($ticket_id);
@@ -373,16 +407,30 @@ function validate( $override_availability = false ){
 					}
 					// END
 				}
-				$this->errors = array_merge($this->errors, $EM_Ticket_Booking->get_errors());
 			}
 			$result = $basic && !in_array(false,$ticket_validation);
 		}else{
 			$result = false;
 		}
-		//is there enough space overall?
-		if( !$override_availability && $this->get_event()->get_bookings()->get_available_spaces() < $this->get_spaces() ){
-		    $result = false;
-		    $this->add_error(get_option('dbem_booking_feedback_full'));
+		if( !$override_availability ){
+			// are bookings even available due to event and ticket cut-offs/restrictions? This is checked earlier in booking processes, but is relevant in checkout/cart situations where a previously-made booking is validated just before checkout
+			if( $this->get_event()->rsvp_end()->getTimestamp() < time() ){
+				$result = false;
+				$this->add_error(get_option('dbem_bookings_form_msg_closed'));
+			}else{
+				foreach( $this->get_tickets_bookings() as $EM_Ticket_Booking ){
+					if( !$EM_Ticket_Booking->get_ticket()->is_available() ){
+						$result = false;
+						$message = __('The ticket %s is no longer available.', 'events-manager');
+						$this->add_error(get_option('dbem_booking_feedback_ticket_unavailable', sprintf($message, "'".$EM_Ticket_Booking->get_ticket()->name."'")));
+					}
+				}
+			}
+			//is there enough space overall?
+			if( $this->get_event()->get_bookings()->get_available_spaces() < $this->get_spaces() ){
+				$result = false;
+				$this->add_error(get_option('dbem_booking_feedback_full'));
+			}
 		}
 		//can we book this amount of spaces at once?
 		if( $this->get_event()->event_rsvp_spaces > 0 && $this->get_spaces() > $this->get_event()->event_rsvp_spaces ){
@@ -634,7 +682,8 @@ function get_price_adjustments_summary( $type, $pre_or_post = 'both', $price = f
 			if( !empty($adjustment['amount']) ){
 				if( !empty($adjustment['tax']) && $adjustment['tax'] == $pre_or_post ){
 					if( !empty($adjustment['type']) ){
-						$adjustment_summary_item = array('name' => $adjustment['name'], 'desc' => $adjustment['desc'], 'adjustment'=>'0', 'amount_adjusted'=>0, 'tax'=>$pre_or_post);
+						$desc = !empty($adjustment['desc']) ? $adjustment['desc'] : '';
+						$adjustment_summary_item = array('name' => $adjustment['name'], 'desc' => $desc, 'adjustment'=>'0', 'amount_adjusted'=>0, 'tax'=>$pre_or_post);
 						if( $adjustment['type'] == '%' ){ //adjustment by percentage
 							$adjustment_summary_item['amount_adjusted'] = round($price * ($adjustment['amount']/100),2);
 							$adjustment_summary_item['amount'] = $this->format_price($adjustment_summary_item['amount_adjusted']);
@@ -701,7 +750,7 @@ function get_total_paid( $format = false ){
 	 */
 	function get_event(){
 		global $EM_Event;
-		if( is_object($this->event) && get_class($this->event)=='EM_Event' && $this->event->event_id == $this->event_id ){
+		if( is_object($this->event) && get_class($this->event)=='EM_Event' && ($this->event->event_id == $this->event_id || (EM_ML::$is_ml && $this->event->event_parent == $this->event_id)) ){
 			return $this->event;
 		}elseif( is_object($EM_Event) && $EM_Event->event_id == $this->event_id ){
 			$this->event = $EM_Event;
@@ -726,7 +775,7 @@ function get_tickets(){
 	
 	/**
 	 * Gets the ticket object this booking belongs to, saves a reference in ticket property
-	 * @return EM_Tickets_Bookings
+	 * @return EM_Tickets_Bookings EM_Tickets_Bookings
 	 */
 	function get_tickets_bookings(){
 		global $wpdb;
@@ -1132,7 +1181,7 @@ function output($format, $target="html") {
 					break;
 				case '#_BOOKINGADMINURL':
 				case '#_BOOKINGADMINLINK':
-					$bookings_link = esc_url( add_query_arg('booking_id', $this->booking_id, $this->event->get_bookings_url()) );
+					$bookings_link = esc_url( add_query_arg('booking_id', $this->booking_id, $this->get_event()->get_bookings_url()) );
 					if($result == '#_BOOKINGADMINLINK'){
 						$replace = '<a href="'.$bookings_link.'">'.esc_html__('Edit Booking', 'events-manager'). '</a>';
 					}else{
diff --git a/classes/em-bookings.php b/classes/em-bookings.php
index 7b4b077..68a5332 100644
--- a/classes/em-bookings.php
+++ b/classes/em-bookings.php
@@ -367,9 +367,11 @@ function unapprove( $booking_ids ){
 	/**
 	 * @param int $status
 	 * @param array|int $booking_ids
+	 * @param bool $send_email
+	 * @param bool $ignore_spaces
 	 * @return bool
 	 */
-	function set_status($status, $booking_ids){
+	function set_status( $status, $booking_ids, $send_email = true, $ignore_spaces = false ){
 		//FIXME status should work with instantiated object
 		if( self::array_is_numeric($booking_ids) ){
 			//Get all the bookings
@@ -381,7 +383,7 @@ function set_status($status, $booking_ids){
 					$this->feedback_message = __('Bookings %s. Mails Sent.', 'events-manager');
 					return false;
 				}
-				$results[] = $EM_Booking->set_status($status);
+				$results[] = $EM_Booking->set_status($status, $send_email, $ignore_spaces);
 			}
 			if( !in_array('false',$results) ){
 				$this->feedback_message = __('Bookings %s. Mails Sent.', 'events-manager');
diff --git a/classes/em-event-post.php b/classes/em-event-post.php
index 88a205c..fd40c76 100755
--- a/classes/em-event-post.php
+++ b/classes/em-event-post.php
@@ -205,7 +205,7 @@ public static function disable_the_content( $content ){
 	
 	public static function the_content( $content ){
 		global $post, $EM_Event;
-		if( $post->post_type == EM_POST_TYPE_EVENT ){
+		if( !empty($post) && $post->post_type == EM_POST_TYPE_EVENT ){
 			if( is_archive() || is_search() ){
 				if(get_option('dbem_cp_events_archive_formats')){
 					$EM_Event = em_get_event($post);
@@ -219,6 +219,8 @@ public static function the_content( $content ){
 						//we don't do extra checks here because WP will have already done the work for us here...
 						$EM_Event->post_content = $post->post_content;
 						$EM_Event->post_content_filtered = $post->post_content_filtered;
+					}else{
+						$EM_Event->post_content = $content;
 					}
 					ob_start();
 					em_locate_template('templates/event-single.php',true);
diff --git a/classes/em-event-posts-admin.php b/classes/em-event-posts-admin.php
index 0c2ed70..7b83bd9 100755
--- a/classes/em-event-posts-admin.php
+++ b/classes/em-event-posts-admin.php
@@ -40,13 +40,13 @@ public static function admin_head(){
 		<script type="text/javascript">
 			jQuery(document).ready( function($){
 				$('.inline-edit-date').prev().css('display','none').next().css('display','none').next().css('display','none');
-				$('.em-detach-link').click(function( event ){
+				$('.em-detach-link').on('click', function( event ){
 					if( !confirm(EM.event_detach_warning) ){
 						event.preventDefault();
 						return false;
 					}
 				});
-				$('.em-delete-recurrence-link').click(function( event ){
+				$('.em-delete-recurrence-link').on('click', function( event ){
 					if( !confirm(EM.delete_recurrence_warning) ){
 						event.preventDefault();
 						return false;
diff --git a/classes/em-event.php b/classes/em-event.php
index 514145f..0e9c9b9 100644
--- a/classes/em-event.php
+++ b/classes/em-event.php
@@ -429,12 +429,13 @@ function __construct($id = false, $search_by = 'event_id') {
 			0 => __('Pending','events-manager'),
 			1 => __('Approved','events-manager')
 		);
+		// fire hook to add any extra info to an event
+		do_action('em_event', $this, $id, $search_by);
 		//add this event to the cache
 		if( $this->event_id && $this->post_id ){
 			wp_cache_set($this->event_id, $this, 'em_events');
 			wp_cache_set($this->post_id, $this->event_id, 'em_events_ids');
 		}
-		do_action('em_event', $this, $id, $search_by);
 	}
 	
 	function __get( $var ){
@@ -2033,8 +2034,8 @@ function output($format, $target="html") {
 					$offset = 3;
 				}
 			}
-			if( $date == 'end' && $this->event_end == $this->event_start ){
-				$replace = __( apply_filters('em_event_output_placeholder', '', $this, $result, $target, array($result)) );
+			if( $date == 'end' && $this->event_start_date == $this->event_end_date ){
+				$replace = apply_filters('em_event_output_placeholder', '', $this, $result, $target, array($result));
 			}else{
 				$date_format = substr( $result, $offset, (strlen($result)-($offset+1)) );
 				if( !empty($show_site_timezone) ){
@@ -2536,7 +2537,7 @@ function output($format, $target="html") {
 							}
 						}
 					}
-					if( $min === false ) $min = 0;
+					if( empty($min) ) $min = 0;
 					if( $min != $max ){
 						$replace = em_get_currency_formatted($min).' - '.em_get_currency_formatted($max);
 					}else{
@@ -2731,7 +2732,7 @@ function output($format, $target="html") {
 						$dateEnd = $this->end()->format('Ymd\THis');
 					}
 					//build url
-					$gcal_url = 'http://www.google.com/calendar/event?action=TEMPLATE&text=event_name&dates=start_date/end_date&details=post_content&location=location_name&trp=false&sprop=event_url&sprop=name:blog_name&ctz=event_timezone';
+					$gcal_url = 'https://www.google.com/calendar/event?action=TEMPLATE&text=event_name&dates=start_date/end_date&details=post_content&location=location_name&trp=false&sprop=event_url&sprop=name:blog_name&ctz=event_timezone';
 					$gcal_url = str_replace('event_name', urlencode($this->event_name), $gcal_url);
 					$gcal_url = str_replace('start_date', urlencode($dateStart), $gcal_url);
 					$gcal_url = str_replace('end_date', urlencode($dateEnd), $gcal_url);
@@ -2754,17 +2755,18 @@ function output($format, $target="html") {
 					//get the final url
 					$replace = $gcal_url;
 					if( $result == '#_EVENTGCALLINK' ){
-						$img_url = 'www.google.com/calendar/images/ext/gc_button2.gif';
-						$img_url = is_ssl() ? 'https://'.$img_url:'http://'.$img_url;
+						$img_url = 'https://www.google.com/calendar/images/ext/gc_button2.gif';
 						$replace = '<a href="'.esc_url($replace).'" target="_blank"><img src="'.esc_url($img_url).'" alt="0" border="0"></a>';
 					}
 					break;
 				//Event location (not physical location)
 				case '#_EVENTLOCATION':
-					if( !empty($placeholders[3][$key]) ){
-						$replace = $this->get_event_location()->output($placeholders[3][$key]);
-					}else{
-						$replace = $this->get_event_location()->output();
+					if( $this->has_event_location() ) {
+						if (!empty($placeholders[3][$key])) {
+							$replace = $this->get_event_location()->output( $placeholders[3][$key], $target );
+						} else {
+							$replace = $this->get_event_location()->output( null, $target );
+						}
 					}
 					break;
 				// GGG
diff --git a/classes/em-location-post.php b/classes/em-location-post.php
index 825222c..0aa893a 100755
--- a/classes/em-location-post.php
+++ b/classes/em-location-post.php
@@ -93,7 +93,7 @@ public static function disable_the_content( $content ){
 	
 	public static function the_content( $content ){
 		global $post, $EM_Location;
-		if( $post->post_type == EM_POST_TYPE_LOCATION ){
+		if( !empty($post) && $post->post_type == EM_POST_TYPE_LOCATION ){
 			if( is_archive() || is_search() ){
 				if( get_option('dbem_cp_locations_archive_formats') ){
 					$EM_Location = em_get_location($post);
@@ -102,6 +102,13 @@ public static function the_content( $content ){
 			}else{
 				if( get_option('dbem_cp_locations_formats') && !post_password_required() ){
 					$EM_Location = em_get_location($post);
+					if( !empty($_REQUEST['preview']) ){
+						//we don't do extra checks here because WP will have already done the work for us here...
+						$EM_Location->post_content = $post->post_content;
+						$EM_Location->post_content_filtered = $post->post_content_filtered;
+					}else{
+						$EM_Location->post_content = $content;
+					}
 					ob_start();
 					em_locate_template('templates/location-single.php',true);
 					$content = ob_get_clean();
diff --git a/classes/em-mailer.php b/classes/em-mailer.php
index 9348e91..c09690e 100644
--- a/classes/em-mailer.php
+++ b/classes/em-mailer.php
@@ -29,11 +29,14 @@ public function send($subject="no title",$body="No message specified", $receiver
 		$subject = html_entity_decode(wp_kses_data($subject)); //decode entities, but run kses first just in case users use placeholders containing html
 		if( is_array($receiver) ){
 			$receiver_emails = array();
-			foreach($receiver as $receiver_email){
+			foreach($receiver as $k => $receiver_email){
+				$receiver_email = trim($receiver_email);
+				$receiver[$k] = $receiver_email;
 				$receiver_emails[] = is_email($receiver_email);
 			}
 			$emails_ok = !in_array(false, $receiver_emails);
 		}else{
+			$receiver = trim($receiver);
 			$emails_ok = is_email($receiver);
 		}
 		if( get_option('dbem_smtp_html') && get_option('dbem_smtp_html_br') ){
@@ -56,8 +59,10 @@ public function send($subject="no title",$body="No message specified", $receiver
 			remove_action('phpmailer_init', 'EM_Mailer::add_attachments_to_mailer', 9999);
 			//send email
 			if(!$send){
-				global $phpmailer;
-				$this->errors[] = $phpmailer->ErrorInfo;
+				global $phpmailer; /* @var PHPMailer $phpmailer */
+				if( !empty($phpmailer->ErrorInfo) ) {
+					$this->errors[] = $phpmailer->ErrorInfo;
+				}
 			}
 			//cleanup
 			self::delete_email_attachments($attachments);
diff --git a/classes/em-object.php b/classes/em-object.php
index 0be8a9f..0b781b6 100644
--- a/classes/em-object.php
+++ b/classes/em-object.php
@@ -231,7 +231,7 @@ public static function build_sql_conditions( $args = array() ){
 		$tag = $args['tag'];// - not used anymore, accesses the $args directly
 		$location = $args['location'];
 		$bookings = $args['rsvp'];
-		$bookings = !empty($args['bookings']) ? $args['bookings']:$bookings;
+		$bookings = $args['bookings'] !== false ? absint($args['bookings']):$bookings;
 		$owner = $args['owner'];
 		$event = $args['event'];
 		$month = $args['month'];
@@ -590,6 +590,8 @@ public static function build_sql_conditions( $args = array() ){
 			}else{
 				$conditions['bookings'] = "(event_id = 0)";
 			}
+		}elseif( $bookings == 0 && $bookings !== false ){
+			$conditions['bookings'] = 'event_rsvp=0';
 		}
 		//Default ownership belongs to an event, child objects can just overwrite this if needed.
 		if( is_numeric($owner) ){
@@ -655,7 +657,7 @@ public static function get_taxonomies(){
 	 * @param array $args
 	 * @return array
 	 */
-	public static function build_wpquery_conditions( $args = array(), $wp_query ){
+	public static function build_wpquery_conditions( $args, $wp_query ){
 		global $wpdb;
 		
 		$args = apply_filters('em_object_build_sql_conditions_args',$args);
@@ -1688,7 +1690,7 @@ function output_excerpt($excerpt_length = 55, $excerpt_more = '[...]', $cut_exce
 	}
 
 	function sanitize_time( $time ){
-		if( !empty($time) && preg_match ( '/^([01]\d|2[0-3]):([0-5]\d) ?(AM|PM)?$/', $time, $match ) ){
+		if( !empty($time) && preg_match ( '/^([01]?\d|2[0-3]):([0-5]\d) ?(AM|PM)?$/', $time, $match ) ){
 			if( !empty($match[3]) && $match[3] == 'PM' && $match[1] != 12 ){
 				$match[1] = 12+$match[1];
 			}elseif( !empty($match[3]) && $match[3] == 'AM' && $match[1] == 12 ){
diff --git a/classes/em-person.php b/classes/em-person.php
index 3bf3170..c0f6cfd 100644
--- a/classes/em-person.php
+++ b/classes/em-person.php
@@ -109,9 +109,9 @@ function display_summary(){
 
 	function get_summary(){
 	    $summary = array(
-            'dbem_phone' => array('name' => __('Name','events-manager'), 'value' => $this->get_name()),
-		    'user_name' => array('name' => __('Email','events-manager'), 'value' => $this->user_email),
-		    'user_email' => array('name' => __('Phone','events-manager'), 'value' => $this->phone),
+		    'user_name' => array('name' => __('Name','events-manager'), 'value' => $this->get_name()),
+		    'user_email' => array('name' => __('Email','events-manager'), 'value' => $this->user_email),
+		    'dbem_phone' => array('name' => __('Phone','events-manager'), 'value' => $this->phone),
         );
 	    $summary = array_merge( $summary, $this->custom_user_fields );
 	    return apply_filters('em_person_get_summary', $summary, $this);
diff --git a/classes/em-taxonomy-frontend.php b/classes/em-taxonomy-frontend.php
index 37f9b6c..4a17499 100644
--- a/classes/em-taxonomy-frontend.php
+++ b/classes/em-taxonomy-frontend.php
@@ -40,6 +40,8 @@ public static function init(){
 	public static function template($template = ''){
 		global $wp_query, $wp_the_query, $em_the_query, $post;
 		if( is_tax(self::$taxonomy_name) && !locate_template('taxonomy-'.self::$taxonomy_name.'.php') && get_option('dbem_cp_'. self::$option_name_plural .'_formats', true) ){
+			do_action('em_pre_'. self::$option_name .'_taxonomy_template');
+			do_action('em_pre_taxonomy_template', get_called_class(), static::$tax_class);
 			$em_the_query = $wp_the_query; //use this for situations where other plugins need to access 'original' query data, which you can switch back/forth.
 			$EM_Taxonomy = $GLOBALS[self::$tax_class] = EM_Taxonomy_Term::get($wp_query->queried_object->term_id, self::$tax_class);
 			if( self::get_page_id() ){
@@ -88,6 +90,7 @@ public static function template($template = ''){
 				add_filter('wpseo_head', array(self::$this_class,'flip_the_query'), 1000000);
 			}
 			do_action('em_'. self::$option_name .'_taxonomy_template');
+			do_action('em_taxonomy_template', get_called_class(), static::$tax_class);
 		}
 		return $template;
 	}
diff --git a/classes/em-ticket-booking.php b/classes/em-ticket-booking.php
index 45fe7e3..add9c86 100644
--- a/classes/em-ticket-booking.php
+++ b/classes/em-ticket-booking.php
@@ -34,7 +34,6 @@ class EM_Ticket_Booking extends EM_Object{
 	/**
 	 * Creates ticket object and retreives ticket data (default is a blank ticket object). Accepts either array of ticket data (from db) or a ticket id.
 	 * @param mixed $ticket_data
-	 * @return null
 	 */
 	function __construct( $ticket_data = false ){
 		if( $ticket_data !== false ){
@@ -54,6 +53,14 @@ function __construct( $ticket_data = false ){
 		}
 	}
 	
+	/**
+	 * Cleans up serialization of this object and returns only relevant fields. For EM_Bookings that get serialized but aren't saved yet with an ID, they should populate the booking object upon wakeup.
+	 * @return string[]
+	 */
+	function __sleep(){
+		return array( 'ticket_booking_id','booking_id','ticket_id','ticket_booking_price','ticket_booking_spaces' );
+	}
+	
 	/**
 	 * Saves the ticket into the database, whether a new or existing ticket
 	 * @return boolean
diff --git a/classes/em-ticket.php b/classes/em-ticket.php
index 279983e..3608334 100644
--- a/classes/em-ticket.php
+++ b/classes/em-ticket.php
@@ -111,6 +111,7 @@ function __construct( $ticket_data = false ){
 			}
 		}
 		$this->compat_keys();
+		if( empty($this->ticket_price) ) $this->ticket_price = 0;
 		do_action('em_ticket',$this, $ticket_data, $ticket);
 	}
 
@@ -429,7 +430,7 @@ function get_price_with_tax( $format = false ){
 	 */
 	function get_price_without_tax( $format = false ){
 	    if( $format ) return $this->format_price($this->ticket_price);
-	    return $this->ticket_price; 
+	    return apply_filters('em_ticket_get_price_without_tax', $this->ticket_price, $this);
 	}
 	
 	/**
diff --git a/classes/em-tickets-bookings.php b/classes/em-tickets-bookings.php
index 72e78e9..e49c276 100644
--- a/classes/em-tickets-bookings.php
+++ b/classes/em-tickets-bookings.php
@@ -89,6 +89,7 @@ function save(){
 	/**
 	 * Add a booking into this event object, checking that there's enough space for the event
 	 * @param EM_Ticket_Booking $EM_Ticket_Booking
+	 * @param boolean $override
 	 * @return boolean
 	 */
 	function add( $EM_Ticket_Booking, $override = false ){ //note, $override was a quick fix, not necessarily permanent, so don't depend on it just yet
@@ -292,20 +293,30 @@ public static function get_default_search( $array_or_defaults = array(), $array
 	//Iterator Implementation
     public function rewind(){
         reset($this->tickets_bookings);
-    }  
+    }
+	
+	/**
+	 * @return EM_Ticket_Booking
+	 */
     public function current(){
         $var = current($this->tickets_bookings);
         return $var;
-    }  
+    }
+	/**
+	 * @return int Ticket ID
+	 */
     public function key(){
         $var = key($this->tickets_bookings);
         return $var;
-    }  
-    public function next(){
+    }
+	/**
+	 * @return EM_Ticket_Booking
+	 */
+	public function next(){
         $var = next($this->tickets_bookings);
         return $var;
     }
-    public function valid(){
+	public function valid(){
         $key = key($this->tickets_bookings);
         $var = ($key !== NULL && $key !== FALSE);
         return $var;
diff --git a/classes/em-tickets.php b/classes/em-tickets.php
index 9569c4a..a24b901 100644
--- a/classes/em-tickets.php
+++ b/classes/em-tickets.php
@@ -259,7 +259,10 @@ function get_ticket_collumns($EM_Event = false){
 	//Iterator Implementation
     public function rewind(){
         reset($this->tickets);
-    }  
+    }
+	/**
+	 * @return EM_Ticket
+	 */
     public function current(){
         $var = current($this->tickets);
         return $var;
@@ -267,7 +270,10 @@ public function current(){
     public function key(){
         $var = key($this->tickets);
         return $var;
-    }  
+    }
+	/**
+	 * @return EM_Ticket
+	 */
     public function next(){
         $var = next($this->tickets);
         return $var;
diff --git a/classes/event-locations/em-event-location-url.php b/classes/event-locations/em-event-location-url.php
index f1f38ac..c89f3a9 100644
--- a/classes/event-locations/em-event-location-url.php
+++ b/classes/event-locations/em-event-location-url.php
@@ -57,7 +57,7 @@ public static function get_label( $label_type = 'singular' ){
 		return parent::get_label($label_type);
 	}
 	
-	public function output( $what = null ){
+	public function output( $what = null, $target = null ){
 		if( $what === null ){
 			return '<a href="'. esc_url($this->url) .'" target="_blank">'. esc_html($this->text) .'</a>';
 		}elseif( $what === '_self' ){
diff --git a/classes/event-locations/em-event-location.php b/classes/event-locations/em-event-location.php
index 2ce4d31..6001f1c 100644
--- a/classes/event-locations/em-event-location.php
+++ b/classes/event-locations/em-event-location.php
@@ -3,8 +3,9 @@
 /**
  * Class EM_Event_Location
  * This class is to be extended by any event location type. The only time this class is not used when not extended is if
- * @property-read string type
- * @property string event
+ * @property-read string $type
+ * @property array $data
+ * @property string $event
  */
 class Event_Location {
 	/**
@@ -51,13 +52,15 @@ public function __construct( $EM_Event ) {
 	
 	/**
 	 * @param $name
-	 * @return string|null
+	 * @return string|null|array
 	 */
 	public function __get( $name ) {
 		if( $name == 'type' ){
 			return static::$type;
 		}elseif( $name == 'event' ){
 			return $this->event;
+		}elseif( $name == 'data' ){
+			return $this->data;
 		}elseif( in_array($name, $this->properties) && array_key_exists($name, $this->data) ){
 			return $this->data[$name];
 		}
@@ -67,6 +70,8 @@ public function __get( $name ) {
 	public function __set($name, $value) {
 		if( $name === 'event' && is_object($value) && property_exists($value, 'event_id') ){ // we check for the event_id property in case we're dealing with an extended class
 			$this->event = $value;
+		}elseif( $name == 'data' && is_array($value) ){
+			$this->data = $value;
 		}elseif( in_array($name, $this->properties) ){
 			$this->data[$name] = $value;
 		}
@@ -187,7 +192,7 @@ public static function get_label( $label_type = 'siingular' ){
 		return static::$type;
 	}
 	
-	public function output( $what = null ){
+	public function output( $what = null, $target = null ){
 		if( $what !== null && $what !== 'type' ){
 			return esc_html($this->$what);
 		}else{
diff --git a/em-actions.php b/em-actions.php
index 072eb31..d9f2dbe 100644
--- a/em-actions.php
+++ b/em-actions.php
@@ -694,7 +694,7 @@ function em_init_actions() {
 		fclose($handle);
 		exit();
 	}
-}  
+}
 add_action('init','em_init_actions',11);
 
 /**
diff --git a/em-data-privacy.php b/em-data-privacy.php
index e260065..d3f60d4 100644
--- a/em-data-privacy.php
+++ b/em-data-privacy.php
@@ -6,14 +6,20 @@
 function em_data_privacy_consent_checkbox( $EM_Object = false ){
 	if( !empty($EM_Object) && (!empty($EM_Object->booking_id) || !empty($EM_Object->post_id)) ) return; //already saved so consent was given at one point
 	$label = get_option('dbem_data_privacy_consent_text');
+	// buddyboss fix since bb v1.6.0
+	if( has_filter( 'the_privacy_policy_link', 'bp_core_change_privacy_policy_link_on_private_network') ) $bb_fix = remove_filter('the_privacy_policy_link', 'bp_core_change_privacy_policy_link_on_private_network', 999999);
+	// replace privacy policy text %s with link to policy page
 	if( function_exists('get_the_privacy_policy_link') ) $label = sprintf($label, get_the_privacy_policy_link());
+	// buddyboss unfix since bb v1.6.0
+	if( !empty($bb_fix) ) add_filter( 'the_privacy_policy_link', 'bp_core_change_privacy_policy_link_on_private_network', 999999, 2 );
+	// check if consent was previously given and check box if true
 	if( is_user_logged_in() ){
-	    //check if consent was previously given and check box if true
         $consent_given_already = get_user_meta( get_current_user_id(), 'em_data_privacy_consent', true );
         if( !empty($consent_given_already) && get_option('dbem_data_privacy_consent_remember') == 1 ) return; //ignore if consent given as per settings
 		if( !empty($consent_given_already) && get_option('dbem_data_privacy_consent_remember') == 2 ) $checked = true;
     }
     if( empty($checked) && !empty($_REQUEST['data_privacy_consent']) ) $checked = true;
+    // output checkbox
 	?>
     <p class="input-group input-checkbox input-field-data_privacy_consent">
 		<label>
diff --git a/em-functions.php b/em-functions.php
index 2190d8a..f0d6363 100644
--- a/em-functions.php
+++ b/em-functions.php
@@ -220,9 +220,9 @@ function em_get_scopes(){
 
 function em_get_currencies(){
 	$currencies = new stdClass();
-	$currencies->names = array('EUR' => 'EUR - Euros','USD' => 'USD - U.S. Dollars','GBP' => 'GBP - British Pounds','CAD' => 'CAD - Canadian Dollars','AUD' => 'AUD - Australian Dollars','BRL' => 'BRL - Brazilian Reais','CZK' => 'CZK - Czech Koruny','DKK' => 'DKK - Danish Kroner','HKD' => 'HKD - Hong Kong Dollars','HUF' => 'HUF - Hungarian Forints','ILS' => 'ILS - Israeli New Shekels','JPY' => 'JPY - Japanese Yen','MYR' => 'MYR - Malaysian Ringgit','MXN' => 'MXN - Mexican Pesos','TWD' => 'TWD - New Taiwan Dollars','NZD' => 'NZD - New Zealand Dollars','NOK' => 'NOK - Norwegian Kroner','PHP' => 'PHP - Philippine Pesos','PLN' => 'PLN - Polish Zlotys','SGD' => 'SGD - Singapore Dollars','SEK' => 'SEK - Swedish Kronor','CHF' => 'CHF - Swiss Francs','THB' => 'THB - Thai Baht','TRY' => 'TRY - Turkish Liras', 'RUB'=>'RUB - Russian Ruble');
-	$currencies->symbols = array( 'EUR' => '&euro;','USD' => '$','GBP' => '&pound;','CAD' => '$','AUD' => '$','BRL' => 'R$','DKK' => 'kr','HKD' => '$','HUF' => 'Ft','JPY' => '&#165;','MYR' => 'RM','MXN' => '$','TWD' => '$','NZD' => '$','NOK' => 'kr','PHP' => 'Php', 'PLN' => '&#122;&#322;','SGD' => '$','SEK' => 'kr','CHF' => 'CHF','TRY' => 'TL','RUB'=>'&#8381;');
-	$currencies->true_symbols = array( 'EUR' => '€','USD' => '$','GBP' => '£','CAD' => '$','AUD' => '$','BRL' => 'R$','DKK' => 'kr','HKD' => '$','HUF' => 'Ft','JPY' => '¥','MYR' => 'RM','MXN' => '$','TWD' => '$','NZD' => '$','NOK' => 'kr','PHP' => 'Php','PLN' => 'zł','SGD' => '$','SEK' => 'kr','CHF' => 'CHF','TRY' => 'TL', 'RUB'=>'₽');
+	$currencies->names = array('EUR' => 'EUR - Euros','USD' => 'USD - U.S. Dollars','GBP' => 'GBP - British Pounds','CAD' => 'CAD - Canadian Dollars','AUD' => 'AUD - Australian Dollars','BRL' => 'BRL - Brazilian Reais','CZK' => 'CZK - Czech koruna','DKK' => 'DKK - Danish Kroner','HKD' => 'HKD - Hong Kong Dollars','HUF' => 'HUF - Hungarian Forints','ILS' => 'ILS - Israeli New Shekels','JPY' => 'JPY - Japanese Yen','MYR' => 'MYR - Malaysian Ringgit','MXN' => 'MXN - Mexican Pesos','TWD' => 'TWD - New Taiwan Dollars','NZD' => 'NZD - New Zealand Dollars','NOK' => 'NOK - Norwegian Kroner','PHP' => 'PHP - Philippine Pesos','PLN' => 'PLN - Polish Zlotys','SGD' => 'SGD - Singapore Dollars','SEK' => 'SEK - Swedish Kronor','CHF' => 'CHF - Swiss Francs','THB' => 'THB - Thai Baht','TRY' => 'TRY - Turkish Liras', 'RUB'=>'RUB - Russian Ruble');
+	$currencies->symbols = array( 'EUR' => '&euro;','USD' => '$','GBP' => '&pound;','CAD' => '$','AUD' => '$','BRL' => 'R$','CZK' => 'K&#269;','DKK' => 'kr','HKD' => '$','HUF' => 'Ft','JPY' => '&#165;','MYR' => 'RM','MXN' => '$','TWD' => '$','NZD' => '$','NOK' => 'kr','PHP' => 'Php', 'PLN' => '&#122;&#322;','SGD' => '$','SEK' => 'kr','CHF' => 'CHF','TRY' => 'TL','RUB'=>'&#8381;');
+	$currencies->true_symbols = array( 'EUR' => '€','USD' => '$','GBP' => '£','CAD' => '$','AUD' => '$','BRL' => 'R$','CZK' => 'Kč','DKK' => 'kr','HKD' => '$','HUF' => 'Ft','JPY' => '¥','MYR' => 'RM','MXN' => '$','TWD' => '$','NZD' => '$','NOK' => 'kr','PHP' => 'Php','PLN' => 'zł','SGD' => '$','SEK' => 'kr','CHF' => 'CHF','TRY' => 'TL', 'RUB'=>'₽');
 	return apply_filters('em_get_currencies',$currencies);
 }
 
@@ -230,8 +230,8 @@ function em_get_currency_formatted($price, $currency=false, $format=false, $prec
 	$formatted_price = '';
 	if(!$format) $format = get_option('dbem_bookings_currency_format','@#');
 	if(!$currency) $currency = get_option('dbem_bookings_currency');
-	$formatted_price = str_replace('@', em_get_currency_symbol(true,$currency), $format);
-	$formatted_price = str_replace('#', number_format( $price, $precision, get_option('dbem_bookings_currency_decimal_point','.'), get_option('dbem_bookings_currency_thousands_sep',',') ), $formatted_price);
+	$formatted_price = str_replace('#', number_format( $price, $precision, get_option('dbem_bookings_currency_decimal_point','.'), get_option('dbem_bookings_currency_thousands_sep',',') ), $format);
+	$formatted_price = str_replace('@', em_get_currency_symbol(true,$currency), $formatted_price);
 	return apply_filters('em_get_currency_formatted', $formatted_price, $price, $currency, $format);
 }
 
@@ -513,7 +513,11 @@ function em_new_user_notification() {
 	$set_password_url = '';
 	if( function_exists('get_password_reset_key')){
 	    $key = get_password_reset_key( $user );
-	    $set_password_url = network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login');
+	    if( is_wp_error($key) ){
+	    	$set_password_url = __('Contact a site administrator for your password.', 'events-manager');
+	    }else{
+		    $set_password_url = network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login');
+	    }
 	}
     $message  = str_replace(array('%password%','%username%','%passwordurl%'), array($plaintext_pass, $user_login, $set_password_url), $message);
 	global $EM_Mailer;
diff --git a/events-manager.php b/events-manager.php
index d538387..0188359 100644
--- a/events-manager.php
+++ b/events-manager.php
@@ -1,7 +1,7 @@
 <?php
 /*
 Plugin Name: GGG Events Manager
-Version: 5.9.910
+Version: 5.9.1000
 Plugin URI: https://github.com/shashachu/ggg-events-manager/
 Description: Customized version of the Events Manager plugin by Marcus Sykes, tailored towards trooping signups for the Golden Gate Garrison.
 Author: Marcus Sykes, Sha Sha Chu
@@ -10,7 +10,7 @@
 */
 
 /*
-Copyright (c) 2020, Marcus Sykes
+Copyright (c) 2021, Marcus Sykes
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@
 $myUpdateChecker->getVcsApi()->enableReleaseAssets();
 
 // Setting constants
-define('EM_VERSION', 5.9910); //self expanatory
+define('EM_VERSION', 5.99911); //self expanatory, although version currently may not correspond directly with published version number. until 6.0 we're stuck updating 5.999.x
 define('EM_PRO_MIN_VERSION', 2.6712); //self expanatory
 define('EM_PRO_MIN_VERSION_CRITICAL', 2.377); //self expanatory
 define('EM_DIR', dirname( __FILE__ )); //an absolute path to this directory
@@ -692,7 +692,7 @@ function em_locate_template( $template_name, $load=false, $the_args = array() )
  * Since the options filter doesn't have a catchall filter, we send all filters to the __call function and figure out the option that way.
  */
 class EM_Formats {
-	function __construct(){ add_action( 'template_redirect', array(&$this, 'add_filters')); }
+	function __construct(){ add_action( 'events_manager_loaded', array(&$this, 'add_filters')); }
 	function add_filters(){
 		//you can hook into this filter and activate the format options you want to override by supplying the wp option names in an array, just like in the database.
 		$formats = apply_filters('em_formats_filter', array());
diff --git a/includes/css/events_manager.css b/includes/css/events_manager.css
index 4736788..1363313 100644
--- a/includes/css/events_manager.css
+++ b/includes/css/events_manager.css
@@ -26,14 +26,14 @@ div#em-loading { position:absolute; width:100%; height:100%; background:#FFFFFF
 			div.css-search.has-advanced div.em-search-main { padding-bottom:8px; border-bottom:1px solid #dedede; }
 			div.css-search div.em-search-main div { display:inline; }
 			div.css-search div.em-search-field { padding:5px 0px; }
-			div.css-search input.em-search-text, div.css-search input.em-search-geo { width:90%; font-size:16px; line-height:16px; padding:8px; border:none; outline:none !important; color:#666; text-overflow: ellipsis; display:inline-block; }
+			div.css-search input.em-search-text, div.css-search input.em-search-geo { width:90%; font-size:16px; line-height:16px; padding:8px; border:none; color:#666; text-overflow: ellipsis; display:inline-block; }
 			div.css-search div.em-search-geo { margin:0px 0px 0px 5px; padding-left:20px; background:url(../images/search-geo.png) 0px 3px no-repeat; }
 			div.css-search div.em-search-text { margin:0px 0px 0px 5px; padding-left:20px; background:url(../images/search-mag-ico.png) 0px 4px no-repeat; }
 			/* Placeholder text in main section */ 
-				div.css-search div.em-search-main div.em-search-field input::-webkit-input-placeholder { /* WebKit browsers */ font-size:16px; line-height:16px; padding:3px 0px; border:none; outline:none; color:#666; }
-				div.css-search div.em-search-main div.em-search-field input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ font-size:16px; line-height:16px; padding:8px; border:none; outline:none; color:#666; }
-				div.css-search div.em-search-main div.em-search-field input::-moz-placeholder { /* Mozilla Firefox 19+ */ font-size:16px; line-height:16px; padding:8px; border:none; outline:none; color:#666; }
-				div.css-search div.em-search-main div.em-search-field input:-ms-input-placeholder { /* Internet Explorer 10+ */ font-size:16px; line-height:16px; padding:8px; border:none; outline:none; color:#666; }			
+				div.css-search div.em-search-main div.em-search-field input::-webkit-input-placeholder { /* WebKit browsers */ font-size:16px; line-height:16px; padding:3px 0px; border:none; color:#666; }
+				div.css-search div.em-search-main div.em-search-field input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */ font-size:16px; line-height:16px; padding:8px; border:none; color:#666; }
+				div.css-search div.em-search-main div.em-search-field input::-moz-placeholder { /* Mozilla Firefox 19+ */ font-size:16px; line-height:16px; padding:8px; border:none; color:#666; }
+				div.css-search div.em-search-main div.em-search-field input:-ms-input-placeholder { /* Internet Explorer 10+ */ font-size:16px; line-height:16px; padding:8px; border:none; color:#666; }
 			/* Geo field specifics */
 				div.css-search.has-search-geo.has-search-term input.em-search-text, div.css-search.has-search-geo.has-search-term input.em-search-geo { width:40%; }
 				.pac-container .pac-item { padding:4px 4px !important; }
@@ -262,10 +262,6 @@ Please edit your theme's CSS to override this
 	}
 
 /* Time Picker */
-	#start-time, #end-time { width:7em;}
-	#start-time.error, #end-time.error { border:#cc0000 1px solid; }
-	div.time-picker {  position: absolute; height: 191px; width:5em; /* needed for IE */ overflow: auto; background: #fff; border: 1px solid #aaa; z-index: 99; margin: 0; }
-	div.time-picker-12hours { width:7em; /* needed for IE */ }
-	div.time-picker ul { list-style-type: none; margin: 0; padding: 0; }
-	div.time-picker li { cursor: pointer; height: 10px; font: 12px/1 Helvetica, Arial, sans-serif; padding: 4px 3px; }
-	div.time-picker li.selected { background: #0063CE; color: #fff; }
\ No newline at end of file
+	.em-time-input { width:7em;}
+	.em-time-range .em-time-input.error, .em-time-input.error { border:#cc0000 1px solid; }
+	.ui-em_timepicker-wrapper{overflow-y:auto;max-height:150px;width:6.5em;background:#fff;border:1px solid #ddd;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);z-index:10052;margin:0}.ui-em_timepicker-wrapper.ui-em_timepicker-with-duration{width:13em}.ui-em_timepicker-wrapper.ui-em_timepicker-with-duration.ui-em_timepicker-step-30,.ui-em_timepicker-wrapper.ui-em_timepicker-with-duration.ui-em_timepicker-step-60{width:11em}.ui-em_timepicker-list,.ui-em_timepicker-list li{margin:0;padding:0;list-style:none}.ui-em_timepicker-duration{margin-left:5px;color:#888}.ui-em_timepicker-list:hover .ui-em_timepicker-duration{color:#888}.ui-em_timepicker-list li{padding:3px 0 3px 5px;cursor:pointer;white-space:nowrap;color:#000}.ui-em_timepicker-list:hover .ui-em_timepicker-selected{background:#fff;color:#000}.ui-em_timepicker-list .ui-em_timepicker-selected:hover,.ui-em_timepicker-list li:hover,li.ui-em_timepicker-selected{background:#1980ec;color:#fff}.ui-em_timepicker-list li:hover .ui-em_timepicker-duration,li.ui-em_timepicker-selected .ui-em_timepicker-duration{color:#ccc}.ui-em_timepicker-list li.ui-em_timepicker-disabled,.ui-em_timepicker-list li.ui-em_timepicker-disabled:hover,.ui-em_timepicker-list li.ui-em_timepicker-selected.ui-em_timepicker-disabled{color:#888;cursor:default}.ui-em_timepicker-list li.ui-em_timepicker-disabled:hover,.ui-em_timepicker-list li.ui-em_timepicker-selected.ui-em_timepicker-disabled{background:#f2f2f2}
\ No newline at end of file
diff --git a/includes/css/events_manager_admin.css b/includes/css/events_manager_admin.css
index 296c420..a47793a 100644
--- a/includes/css/events_manager_admin.css
+++ b/includes/css/events_manager_admin.css
@@ -200,8 +200,4 @@ table.em-caps-table th, table.em-caps-table td { width:auto !important; }
 
 /* Time Picker */
 .em-time-input.error { border:#cc0000 1px solid; }
-div.time-picker {  position: absolute; height: 191px; width:4.5em; /* needed for IE */ overflow: auto; background: #fff; border: 1px solid #aaa; z-index: 99; margin: 0; }
-div.time-picker-12hours { width:6.5em; /* needed for IE */ }
-div.time-picker ul { list-style-type: none; margin: 0; padding: 0; }
-div.time-picker li { cursor: pointer; height: 10px; font: 12px/1 Helvetica, Arial, sans-serif; padding: 4px 3px; }
-div.time-picker li.selected { background: #0063CE; color: #fff; }
\ No newline at end of file
+.ui-em_timepicker-wrapper{overflow-y:auto;max-height:150px;width:6.5em;background:#fff;border:1px solid #ddd;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);outline:0;z-index:10052;margin:0}.ui-em_timepicker-wrapper.ui-em_timepicker-with-duration{width:13em}.ui-em_timepicker-wrapper.ui-em_timepicker-with-duration.ui-em_timepicker-step-30,.ui-em_timepicker-wrapper.ui-em_timepicker-with-duration.ui-em_timepicker-step-60{width:11em}.ui-em_timepicker-list,.ui-em_timepicker-list li{margin:0;padding:0;list-style:none}.ui-em_timepicker-duration{margin-left:5px;color:#888}.ui-em_timepicker-list:hover .ui-em_timepicker-duration{color:#888}.ui-em_timepicker-list li{padding:3px 0 3px 5px;cursor:pointer;white-space:nowrap;color:#000}.ui-em_timepicker-list:hover .ui-em_timepicker-selected{background:#fff;color:#000}.ui-em_timepicker-list .ui-em_timepicker-selected:hover,.ui-em_timepicker-list li:hover,li.ui-em_timepicker-selected{background:#1980ec;color:#fff}.ui-em_timepicker-list li:hover .ui-em_timepicker-duration,li.ui-em_timepicker-selected .ui-em_timepicker-duration{color:#ccc}.ui-em_timepicker-list li.ui-em_timepicker-disabled,.ui-em_timepicker-list li.ui-em_timepicker-disabled:hover,.ui-em_timepicker-list li.ui-em_timepicker-selected.ui-em_timepicker-disabled{color:#888;cursor:default}.ui-em_timepicker-list li.ui-em_timepicker-disabled:hover,.ui-em_timepicker-list li.ui-em_timepicker-selected.ui-em_timepicker-disabled{background:#f2f2f2}
\ No newline at end of file
diff --git a/includes/js/admin-settings.js b/includes/js/admin-settings.js
index 2f7933b..1457745 100755
--- a/includes/js/admin-settings.js
+++ b/includes/js/admin-settings.js
@@ -2,7 +2,7 @@ jQuery(document).ready(function($){
 	//Meta Box Options
 	var open_close = $('<a href="#" style="display:block; float:right; clear:right; margin:10px;">'+EM.open_text+'</a>');
 	$('#em-options-title').before(open_close);
-	open_close.click( function(e){
+	open_close.on('click', function(e){
 		e.preventDefault();
 		if($(this).text() == EM.close_text){
 			$(".postbox").addClass('closed');
@@ -12,10 +12,10 @@ jQuery(document).ready(function($){
 			$(this).text(EM.close_text);
 		} 
 	});
-	$(".postbox > h3").click(function(){ $(this).parent().toggleClass('closed'); });
+	$(".postbox > h3").on('click', function(){ $(this).parent().toggleClass('closed'); });
 	$(".postbox").addClass('closed');
 	//Navigation Tabs
-	$('.tabs-active .nav-tab-wrapper .nav-tab').click(function(){
+	$('.tabs-active .nav-tab-wrapper .nav-tab').on('click', function(){
 		el = $(this);
 		elid = el.attr('id');
 		$('.em-menu-group').hide(); 
@@ -23,7 +23,7 @@ jQuery(document).ready(function($){
 		$(".postbox").addClass('closed');
 		open_close.text(EM.open_text);
 	});
-	$('.nav-tab-wrapper .nav-tab').click(function(){
+	$('.nav-tab-wrapper .nav-tab').on('click', function(){
 		$('.nav-tab-wrapper .nav-tab').removeClass('nav-tab-active').blur();
 		$(this).addClass('nav-tab-active');
 	});
@@ -43,8 +43,8 @@ jQuery(document).ready(function($){
 		//set to general tab by default, so we can also add clicked subsections
 		document.location = navUrl+"#general";
 	}
-	$('.nav-tab-link').click(function(){ $($(this).attr('rel')).trigger('click'); }); //links to mimick tabs
-	$('input[type="submit"]').click(function(){
+	$('.nav-tab-link').on('click', function(){ $($(this).attr('rel')).trigger('click'); }); //links to mimick tabs
+	$('input[type="submit"]').on('click', function(){
 		var el = $(this).parents('.postbox').first();
 		var docloc = document.location.toString().split('#');
 		var newloc = docloc[0];
@@ -60,21 +60,21 @@ jQuery(document).ready(function($){
 		$(this).closest('form').append('<input type="hidden" name="tab_path" value="'+ tab_path +'" />');
 	});
 	//Page Options
-	$('input[name="dbem_cp_events_has_archive"]').change(function(){ //event archives
+	$('input[name="dbem_cp_events_has_archive"]').on('change', function(){ //event archives
 		if( $('input:radio[name="dbem_cp_events_has_archive"]:checked').val() == 1 ){
 			$('tbody.em-event-archive-sub-options').show();
 		}else{
 			$('tbody.em-event-archive-sub-options').hide();
 		}
 	}).trigger('change');
-	$('select[name="dbem_events_page"]').change(function(){
+	$('select[name="dbem_events_page"]').on('change', function(){
 		if( $('select[name="dbem_events_page"]').val() == 0 ){
 			$('tbody.em-event-page-options').hide();
 		}else{
 			$('tbody.em-event-page-options').show();
 		}
 	}).trigger('change');
-	$('input[name="dbem_cp_locations_has_archive"]').change(function(){ //location archives
+	$('input[name="dbem_cp_locations_has_archive"]').on('change', function(){ //location archives
 		if( $('input:radio[name="dbem_cp_locations_has_archive"]:checked').val() == 1 ){
 			$('tbody.em-location-archive-sub-options').show();
 		}else{
@@ -92,7 +92,7 @@ jQuery(document).ready(function($){
 	});
 	$('input:radio[name=dbem_disable_title_rewrites]').trigger('change');
 	//for event grouping
-	$('select[name="dbem_event_list_groupby"]').change(function(){
+	$('select[name="dbem_event_list_groupby"]').on('change', function(){
 		if( $('select[name="dbem_event_list_groupby"]').val() == 0 ){
 			$('tr#dbem_event_list_groupby_header_format_row, tr#dbem_event_list_groupby_format_row').hide();
 		}else{
@@ -100,33 +100,33 @@ jQuery(document).ready(function($){
 		}
 	}).trigger('change');
 	//ML Stuff
-	$('.em-translatable').click(function(){
+	$('.em-translatable').on('click', function(){
 		$(this).nextAll('.em-ml-options').toggle();
 	});
 	//radio triggers
-	$('input[type="radio"].em-trigger').change(function(e){
+	$('input[type="radio"].em-trigger').on('change', function(e){
 		var el = $(this);
 		el.val() == '1' ? $(el.attr('data-trigger')).show() : $(el.attr('data-trigger')).hide();
 	});
 	$('input[type="radio"].em-trigger:checked').trigger('change');
-	$('input[type="radio"].em-untrigger').change(function(e){
+	$('input[type="radio"].em-untrigger').on('change', function(e){
 		var el = $(this);
 		el.val() == '0' ? $(el.attr('data-trigger')).show() : $(el.attr('data-trigger')).hide();
 	});
 	$('input[type="radio"].em-untrigger:checked').trigger('change');
 	//checkbox triggers
-	$('input[type="checkbox"].em-trigger').change(function(e){
+	$('input[type="checkbox"].em-trigger').on('change', function(e){
 		var el = $(this);
 		el.prop('checked') ? $(el.attr('data-trigger')).show() : $(el.attr('data-trigger')).hide();
 	});
 	$('input[type="checkbox"].em-trigger').trigger('change');
-	$('input[type="checkbox"].em-untrigger').change(function(e){
+	$('input[type="checkbox"].em-untrigger').on('change', function(e){
 		var el = $(this);
 		!el.prop('checked') ? $(el.attr('data-trigger')).show() : $(el.attr('data-trigger')).hide();
 	});
 	$('input[type="checkbox"].em-untrigger').trigger('change');
 	//admin tools confirm
-	$('a.admin-tools-db-cleanup').click( function( e ){
+	$('a.admin-tools-db-cleanup').on('click', function( e ){
 		if( !confirm(EM.admin_db_cleanup_warning) ){
 			e.preventDefault();
 			return false;
diff --git a/includes/js/events-manager.js b/includes/js/events-manager.js
index 985035e..aa0104c 100644
--- a/includes/js/events-manager.js
+++ b/includes/js/events-manager.js
@@ -41,14 +41,14 @@ jQuery(document).ready( function($){
 		if( 'placeholder' in document.createElement('input') ){
 			$('input.em-events-search-text, input.em-search-text').attr('placeholder', EM.search_term_placeholder);
 		}else{
-			$('input.em-events-search-text, input.em-search-text').blur(function(){
+			$('input.em-events-search-text, input.em-search-text').on('blur', function(){
 				if( this.value=='' ) this.value = EM.search_term_placeholder;
-			}).focus(function(){
+			}).on('focus', function(){
 				if( this.value == EM.search_term_placeholder ) this.value='';
 			}).trigger('blur');
 		}
 	}
-	$('.em-search-form select[name=country]').change( function(){
+	$('.em-search-form select[name=country]').on('change', function(){
 		var el = $(this);
 		$('.em-search select[name=state]').html('<option value="">'+EM.txt_loading+'</option>');
 		$('.em-search select[name=region]').html('<option value="">'+EM.txt_loading+'</option>');
@@ -70,7 +70,7 @@ jQuery(document).ready( function($){
 		}
 	});
 
-	$('.em-search-form select[name=region]').change( function(){
+	$('.em-search-form select[name=region]').on('change', function(){
 		$('.em-search select[name=state]').html('<option value="">'+EM.txt_loading+'</option>');
 		$('.em-search select[name=town]').html('<option value="">'+EM.txt_loading+'</option>');
 		var data = {
@@ -84,7 +84,7 @@ jQuery(document).ready( function($){
 		$('.em-search select[name=town]').load( EM.ajaxurl, data );
 	});
 
-	$('.em-search-form select[name=state]').change( function(){
+	$('.em-search-form select[name=state]').on('change', function(){
 		$('.em-search select[name=town]').html('<option value="">'+EM.txt_loading+'</option>');
 		var data = {
 			action : 'search_towns',
@@ -176,7 +176,7 @@ jQuery(document).ready( function($){
 	});
 	//Event Editor 
 		//Recurrence Warnings
-		$('#event-form.em-event-admin-recurring').submit( function(event){
+		$('#event-form.em-event-admin-recurring').on('submit', function(event){
 			var form = $(this);
 			if( form.find('input[name="event_reschedule"]').first().val() == 1 ){
 				var warning_text = EM.event_reschedule_warning;
@@ -191,14 +191,14 @@ jQuery(document).ready( function($){
 			}
 		});
 		//Buttons for recurrence warnings within event editor forms
-		$('.em-reschedule-trigger').click(function(e){
+		$('.em-reschedule-trigger').on('click', function(e){
 			e.preventDefault();
 			var trigger = $(this);
 			trigger.closest('.em-recurrence-reschedule').find(trigger.data('target')).removeClass('reschedule-hidden');
 			trigger.siblings('.em-reschedule-value').val(1);
 			trigger.addClass('reschedule-hidden').siblings('a').removeClass('reschedule-hidden');
 		});
-		$('.em-reschedule-cancel').click(function(e){
+		$('.em-reschedule-cancel').on('click', function(e){
 			e.preventDefault();
 			var trigger = $(this);
 			trigger.closest('.em-recurrence-reschedule').find(trigger.data('target')).addClass('reschedule-hidden');
@@ -208,7 +208,7 @@ jQuery(document).ready( function($){
 	//Tickets & Bookings
 	if( $("#em-tickets-form").length > 0 ){
 		//Enable/Disable Bookings
-		$('#event-rsvp').click( function(event){
+		$('#event-rsvp').on('click', function(event){
 			if( !this.checked ){
 				confirmation = confirm(EM.disable_bookings_warning);
 				if( confirmation == false ){
@@ -232,7 +232,7 @@ jQuery(document).ready( function($){
 		};
 		//recurrences and cut-off logic for ticket availability
 		if( $('#em-recurrence-checkbox').length > 0 ){
-			$('#em-recurrence-checkbox').change(function(){
+			$('#em-recurrence-checkbox').on('change', function(){
 				if( $('#em-recurrence-checkbox').is(':checked') ){
 					$('#em-tickets-form .ticket-dates-from-recurring, #em-tickets-form .ticket-dates-to-recurring, #event-rsvp-options .em-booking-date-recurring').show();
 					$('#em-tickets-form .ticket-dates-from-normal, #em-tickets-form .ticket-dates-to-normal, #event-rsvp-options .em-booking-date-normal, #em-tickets-form .hidden').hide();
@@ -248,7 +248,7 @@ jQuery(document).ready( function($){
 			$('#em-tickets-form .ticket-dates-from-recurring, #em-tickets-form .ticket-dates-to-recurring, #event-rsvp-options .em-booking-date-recurring, #em-tickets-form .hidden').hide();
 		}
 		//Add a new ticket
-		$("#em-tickets-add").click(function(e){ 
+		$("#em-tickets-add").on('click', function(e){
 			e.preventDefault();
 			reset_ticket_forms();
 			//create copy of template slot, insert so ready for population
@@ -264,7 +264,11 @@ jQuery(document).ready( function($){
 			slot.show().find('.ticket-actions-edit').trigger('click');
 			//refresh datepicker and values
 			slot.find('.em-date-input-loc').datepicker('destroy').removeAttr('id'); //clear all datepickers
-			slot.find('.em-time-input').unbind().each(function(index, el){ this.timePicker = false; }); //clear all timepickers - consequently, also other click/blur/change events, recreate the further down
+			slot.find('.em-time-input').off().each(function(index, el){
+				if( typeof this.em_timepickerObj == 'object' ){
+					this.em_timepicker('remove');
+				}
+			}); //clear all em_timepickers - consequently, also other click/blur/change events, recreate the further down
 			em_setup_datepicker(slot);
 			em_setup_timepicker(slot);
 		    $('html, body').animate({ scrollTop: slot.offset().top - 30 }); //sends user to form
@@ -459,7 +463,7 @@ jQuery(document).ready( function($){
 			buttons: [{
 				text: EM.bookings_export_save,
 				click: function(e){
-					$(this).children('form').submit();
+					$(this).children('form').trigger('submit');
 					$(this).dialog('close');
 				}
 			}]
@@ -481,7 +485,7 @@ jQuery(document).ready( function($){
 			};
 			//Sync export overlay with table search field changes
 			$('#em-bookings-table form select').each(function(i, el){
-				$(el).change(function(e){
+				$(el).on('change', function(e){
 					var select_el = $(this);
 					var input_par = $('#em-bookings-table-export-form input[name='+select_el.attr('name')+']');
 					var input_par_selected = select_el.find('option:selected');
@@ -490,7 +494,7 @@ jQuery(document).ready( function($){
 			});
 			
 			export_overlay_show_tickets();
-			$('#em-bookings-table-export-form input[name=show_tickets]').click(export_overlay_show_tickets);
+			$('#em-bookings-table-export-form input[name=show_tickets]').on('click', export_overlay_show_tickets);
 			//Sortables
 			$( ".em-bookings-cols-sortable" ).sortable({
 				connectWith: ".em-bookings-cols-sortable",
@@ -655,7 +659,7 @@ jQuery(document).ready( function($){
 	$("#localised-date").show();
 	$("#localised-end-date").show();
 	
-	$('#em-wrapper input.select-all').change(function(){
+	$('#em-wrapper input.select-all').on('change', function(){
 	 	if($(this).is(':checked')){
 			$('input.row-selector').prop('checked', true);
 			$('input.select-all').prop('checked', true);
@@ -668,12 +672,12 @@ jQuery(document).ready( function($){
 	updateIntervalDescriptor(); 
 	updateIntervalSelectors();
 	updateShowHideRecurrence();
-	$('input#event-recurrence').change(updateShowHideRecurrence);
+	$('input#event-recurrence').on('change', updateShowHideRecurrence);
 	   
 	// recurrency elements   
-	$('input#recurrence-interval').keyup(updateIntervalDescriptor);
-	$('select#recurrence-frequency').change(updateIntervalDescriptor);
-	$('select#recurrence-frequency').change(updateIntervalSelectors);
+	$('input#recurrence-interval').on('keyup', updateIntervalDescriptor);
+	$('select#recurrence-frequency').on('change', updateIntervalDescriptor);
+	$('select#recurrence-frequency').on('change', updateIntervalSelectors);
 
 	/* Load any maps */	
 	if( $('.em-location-map').length > 0 || $('.em-locations-map').length > 0 || $('#em-map').length > 0 || $('.em-search-geo').length > 0 ){
@@ -681,7 +685,7 @@ jQuery(document).ready( function($){
 	}
 
 	/* Location Type Selection */
-	$('.em-location-types .em-location-types-select').change(function(){
+	$('.em-location-types .em-location-types-select').on('change', function(){
 		let el = $(this);
 		if( el.val() == 0 ){
 			$('.em-location-type').hide();
@@ -737,7 +741,7 @@ jQuery(document).ready( function($){
 			html_val = "<a>" + em_esc_attr(item.label) + '<br><span style="font-size:11px"><em>'+ em_esc_attr(item.address) + ', ' + em_esc_attr(item.town)+"</em></span></a>";
 			return jQuery( "<li></li>" ).data( "item.autocomplete", item ).append(html_val).appendTo( ul );
 		};
-		jQuery('#em-location-reset a').click( function(){
+		jQuery('#em-location-reset a').on('click', function(){
 			jQuery('div.em-location-data input').css('background-color','#fff').val('').prop('readonly', false);
 			jQuery('div.em-location-data select').css('background-color','#fff').css('color', 'auto').prop('disabled', false);
 			jQuery('div.em-location-data option:selected').removeAttr('selected');
@@ -854,7 +858,7 @@ function em_setup_datepicker(wrap){
 				dateValue.val(dateValue_value);
 			}
 			//add logic for texts
-			dateInput.change(function(){
+			dateInput.on('change', function(){
 				if( jQuery(this).val() == '' ){
 					jQuery(this).nextAll('.em-date-input').first().val('');
 				}
@@ -887,45 +891,51 @@ function em_setup_datepicker(wrap){
 		});
 	}
 }
-
 function em_setup_timepicker(wrap){
 	wrap = jQuery(wrap);
 	var timepicker_options = {
-		show24Hours: EM.show24hours == 1,
 		step:15
 	}
+	timepicker_options.timeFormat = EM.show24hours == 1 ? 'G:i':'g:i A';
 	jQuery(document).triggerHandler('em_timepicker_options', timepicker_options);
-	wrap.find(".em-time-input").timePicker(timepicker_options);
-	
+	wrap.find(".em-time-input").em_timepicker(timepicker_options);
+
 	// Keep the duration between the two inputs.
 	wrap.find(".em-time-range input.em-time-start").each( function(i, el){
-		jQuery(el).data('oldTime', jQuery.timePicker(el).getTime());
-	}).change( function() {
+		var time = jQuery(el);
+		time.data('oldTime', time.em_timepicker('getSecondsFromMidnight'));
+	}).on('change', function() {
 		var start = jQuery(this);
 		var end = start.nextAll('.em-time-end');
 		if (end.val()) { // Only update when second input has a value.
-		    // Calculate duration.
+			// Calculate duration.
 			var oldTime = start.data('oldTime');
-		    var duration = (jQuery.timePicker(end).getTime() - oldTime);
-		    var time = jQuery.timePicker(start).getTime();
-		    if( jQuery.timePicker(end).getTime() >= oldTime ){
-			    // Calculate and update the time in the second input.
-			    jQuery.timePicker(end).setTime(new Date(new Date(time.getTime() + duration)));
+			var duration = (end.em_timepicker('getSecondsFromMidnight') - oldTime) * 1000;
+			var time = start.em_timepicker('getSecondsFromMidnight');
+			if( end.em_timepicker('getSecondsFromMidnight') >= oldTime ){
+				// Calculate and update the time in the second input.
+				end.em_timepicker('setTime', new Date(start.em_timepicker('getTime').getTime() + duration));
 			}
-		    start.data('oldTime', time); 
+			start.data('oldTime', time);
 		}
 	});
 	// Validate.
-	wrap.find(".em-time-range input.em-time-end").change(function() {
+	wrap.find(".event-form-when .em-time-range input.em-time-end").on('change', function() {
 		var end = jQuery(this);
 		var start = end.prevAll('.em-time-start');
+		var wrapper = end.closest('.event-form-when');
+		var start_date = wrapper.find('.em-date-end').val();
+		var end_date = wrapper.find('.em-date-start').val();
 		if( start.val() ){
-			if( jQuery.timePicker(start).getTime() > jQuery.timePicker(this).getTime() && ( jQuery('.em-date-end').val().length == 0 || jQuery('.em-date-start').val() == jQuery('.em-date-end').val() ) ) { end.addClass("error"); }
+			if( start.em_timepicker('getTime') > end.em_timepicker('getTime') && ( end_date.length == 0 || start_date == end_date ) ) { end.addClass("error"); }
 			else { end.removeClass("error"); }
 		}
 	});
+	wrap.find(".event-form-when .em-date-end").on('change', function(){
+		jQuery(this).closest('.event-form-when').find('.em-time-end').trigger('change');
+	});
 	//Sort out all day checkbox
-	wrap.find('.em-time-range input.em-time-all-day').change(function(){
+	wrap.find('.em-time-range input.em-time-all-day').on('change', function(){
 		var allday = jQuery(this);
 		if( allday.is(':checked') ){
 			allday.siblings('.em-time-input').css('background-color','#ccc');
@@ -1055,7 +1065,7 @@ function em_maps_load_location(el){
 	maps[map_id].panBy(40,-70);
 	
 	//JS Hook for handling map after instantiation
-	//Example hook, which you can add elsewhere in your theme's JS - jQuery(document).bind('em_maps_location_hook', function(){ alert('hi');} );
+	//Example hook, which you can add elsewhere in your theme's JS - jQuery(document).on('em_maps_location_hook', function(){ alert('hi');} );
 	jQuery(document).triggerHandler('em_maps_location_hook', [maps[map_id], infoWindow, maps_markers[map_id], map_id]);
 	//map resize listener
 	jQuery(window).on('resize', function(e) {
@@ -1064,7 +1074,7 @@ function em_maps_load_location(el){
 		maps[map_id].panBy(40,-70);
 	});
 }
-jQuery(document).bind('em_search_ajax', function(e, vars, wrapper){
+jQuery(document).on('em_search_ajax', function(e, vars, wrapper){
 	if( em_maps_loaded ){
 		wrapper.find('.em-location-map').each( function(index, el){ em_maps_load_location(el); } );
 		wrapper.find('.em-locations-map').each( function(index, el){ em_maps_load_locations(el); });
@@ -1132,8 +1142,8 @@ function em_maps() {
 				});
 			}
 		};
-		jQuery('#location-select-id, input#location-id').change( function(){get_map_by_id(jQuery(this).val());} );
-		jQuery('#location-name, #location-town, #location-address, #location-state, #location-postcode, #location-country').change( function(){
+		jQuery('#location-select-id, input#location-id').on('change', function(){get_map_by_id(jQuery(this).val());} );
+		jQuery('#location-name, #location-town, #location-address, #location-state, #location-postcode, #location-country').on('change', function(){
 			//build address
 			if( jQuery(this).prop('readonly') === true ) return;
 			var addresses = [ jQuery('#location-address').val(), jQuery('#location-town').val(), jQuery('#location-state').val(), jQuery('#location-postcode').val() ];
@@ -1227,5 +1237,8 @@ function em_esc_attr( str ){
 	return str.replace(/</gi,'&lt;').replace(/>/gi,'&gt;');
 }
 
-/* jQuery timePicker - http://labs.perifer.se/timedatepicker/ @ http://github.com/perifer/timePicker commit 100644 */
-(function(e){function t(t,n,r,i){t.value=e(n).text();e(t).change();if(!navigator.userAgent.match(/msie/i)){t.focus()}r.hide()}function n(e,t){var n=e.getHours();var i=t.show24Hours?n:(n+11)%12+1;var s=e.getMinutes();return r(i)+t.separator+r(s)+(t.show24Hours?"":n<12?" AM":" PM")}function r(e){return(e<10?"0":"")+e}function i(e,t){return typeof e=="object"?o(e):s(e,t)}function s(e,t){if(e){var n=e.split(t.separator);var r=parseFloat(n[0]);var i=parseFloat(n[1]);if(!t.show24Hours){if(r===12&&e.indexOf("AM")!==-1){r=0}else if(r!==12&&e.indexOf("PM")!==-1){r+=12}}var s=new Date(0,0,0,r,i,0);return o(s)}return null}function o(e){e.setFullYear(2001);e.setMonth(0);e.setDate(0);return e}e.fn.timePicker=function(t){var n=e.extend({},e.fn.timePicker.defaults,t);return this.each(function(){e.timePicker(this,n)})};e.timePicker=function(t,n){var r=e(t)[0];return r.timePicker||(r.timePicker=new jQuery._timePicker(r,n))};e.timePicker.version="0.3";e._timePicker=function(r,u){var a=false;var f=false;var l=i(u.startTime,u);var c=i(u.endTime,u);var h="selected";var p="li."+h;e(r).attr("autocomplete","OFF");var d=[];var v=new Date(l);while(v<=c){d[d.length]=n(v,u);v=new Date(v.setMinutes(v.getMinutes()+u.step))}var m=e('<div class="time-picker'+(u.show24Hours?"":" time-picker-12hours")+'"></div>');var g=e("<ul></ul>");for(var y=0;y<d.length;y++){g.append("<li>"+d[y]+"</li>")}m.append(g);m.appendTo("body").hide();m.mouseover(function(){a=true}).mouseout(function(){a=false});e("li",g).mouseover(function(){if(!f){e(p,m).removeClass(h);e(this).addClass(h)}}).mousedown(function(){a=true}).click(function(){t(r,this,m,u);a=false});var b=function(){if(m.is(":visible")){return false}e("li",m).removeClass(h);var t=e(r).offset();m.css({top:t.top+r.offsetHeight,left:t.left});m.show();var i=r.value?s(r.value,u):l;var a=l.getHours()*60+l.getMinutes();var f=i.getHours()*60+i.getMinutes()-a;var p=Math.round(f/u.step);var d=o(new Date(0,0,0,0,p*u.step+a,0));d=l<d&&d<=c?d:l;var v=e("li:contains("+n(d,u)+")",m);if(v.length){v.addClass(h);m[0].scrollTop=v[0].offsetTop}return true};e(r).focus(b).click(b);e(r).blur(function(){if(!a){m.hide()}});e(r)["keydown"](function(n){var i;f=true;var s=m[0].scrollTop;switch(n.keyCode){case 38:if(b()){return false}i=e(p,g);var o=i.prev().addClass(h)[0];if(o){i.removeClass(h);if(o.offsetTop<s){m[0].scrollTop=s-o.offsetHeight}}else{i.removeClass(h);o=e("li:last",g).addClass(h)[0];m[0].scrollTop=o.offsetTop-o.offsetHeight}return false;break;case 40:if(b()){return false}i=e(p,g);var a=i.next().addClass(h)[0];if(a){i.removeClass(h);if(a.offsetTop+a.offsetHeight>s+m[0].offsetHeight){m[0].scrollTop=s+a.offsetHeight}}else{i.removeClass(h);a=e("li:first",g).addClass(h)[0];m[0].scrollTop=0}return false;break;case 13:if(m.is(":visible")){var l=e(p,g)[0];t(r,l,m,u)}return false;break;case 27:m.hide();return false;break}return true});e(r).keyup(function(e){f=false});this.getTime=function(){return s(r.value,u)};this.setTime=function(t){r.value=n(i(t,u),u);e(r).change()}};e.fn.timePicker.defaults={step:30,startTime:new Date(0,0,0,0,0,0),endTime:new Date(0,0,0,23,30,0),separator:":",show24Hours:true}})(jQuery)
\ No newline at end of file
+/*!
+ * jquery-timepicker v1.13.16 - Copyright (c) 2020 Jon Thornton - https://www.jonthornton.com/jquery-timepicker/
+ * Did a search/replace of timepicker to em_timepicker to prevent conflicts.
+ */
+(function(){"use strict";function _typeof(obj){"@babel/helpers - typeof";if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function(obj){return typeof obj}}else{_typeof=function(obj){return obj&&typeof Symbol==="function"&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":typeof obj}}return _typeof(obj)}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function")}}function _defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor)}}function _createClass(Constructor,protoProps,staticProps){if(protoProps)_defineProperties(Constructor.prototype,protoProps);if(staticProps)_defineProperties(Constructor,staticProps);return Constructor}function _defineProperty(obj,key,value){if(key in obj){Object.defineProperty(obj,key,{value:value,enumerable:true,configurable:true,writable:true})}else{obj[key]=value}return obj}function ownKeys(object,enumerableOnly){var keys=Object.keys(object);if(Object.getOwnPropertySymbols){var symbols=Object.getOwnPropertySymbols(object);if(enumerableOnly)symbols=symbols.filter(function(sym){return Object.getOwnPropertyDescriptor(object,sym).enumerable});keys.push.apply(keys,symbols)}return keys}function _objectSpread2(target){for(var i=1;i<arguments.length;i++){var source=arguments[i]!=null?arguments[i]:{};if(i%2){ownKeys(Object(source),true).forEach(function(key){_defineProperty(target,key,source[key])})}else if(Object.getOwnPropertyDescriptors){Object.defineProperties(target,Object.getOwnPropertyDescriptors(source))}else{ownKeys(Object(source)).forEach(function(key){Object.defineProperty(target,key,Object.getOwnPropertyDescriptor(source,key))})}}return target}function _unsupportedIterableToArray(o,minLen){if(!o)return;if(typeof o==="string")return _arrayLikeToArray(o,minLen);var n=Object.prototype.toString.call(o).slice(8,-1);if(n==="Object"&&o.constructor)n=o.constructor.name;if(n==="Map"||n==="Set")return Array.from(n);if(n==="Arguments"||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return _arrayLikeToArray(o,minLen)}function _arrayLikeToArray(arr,len){if(len==null||len>arr.length)len=arr.length;for(var i=0,arr2=new Array(len);i<len;i++)arr2[i]=arr[i];return arr2}function _createForOfIteratorHelper(o){if(typeof Symbol==="undefined"||o[Symbol.iterator]==null){if(Array.isArray(o)||(o=_unsupportedIterableToArray(o))){var i=0;var F=function(){};return{s:F,n:function(){if(i>=o.length)return{done:true};return{done:false,value:o[i++]}},e:function(e){throw e},f:F}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var it,normalCompletion=true,didErr=false,err;return{s:function(){it=o[Symbol.iterator]()},n:function(){var step=it.next();normalCompletion=step.done;return step},e:function(e){didErr=true;err=e},f:function(){try{if(!normalCompletion&&it.return!=null)it.return()}finally{if(didErr)throw err}}}}var ONE_DAY=86400;var roundingFunction=function roundingFunction(seconds,settings){if(seconds===null){return null}else if(typeof settings.step!=="number"){return seconds}else{var offset=seconds%(settings.step*60);var start=settings.minTime||0;offset-=start%(settings.step*60);if(offset>=settings.step*30){seconds+=settings.step*60-offset}else{seconds-=offset}return _moduloSeconds(seconds,settings)}};function _moduloSeconds(seconds,settings){if(seconds==ONE_DAY&&settings.show2400){return seconds}return seconds%ONE_DAY}var DEFAULT_SETTINGS={appendTo:"body",className:null,closeOnWindowScroll:false,disableTextInput:false,disableTimeRanges:[],disableTouchKeyboard:false,durationTime:null,forceRoundTime:false,lang:{},listWidth:null,maxTime:null,minTime:null,noneOption:false,orientation:"l",roundingFunction:roundingFunction,scrollDefault:null,selectOnBlur:false,show2400:false,showDuration:false,showOn:["click","focus"],showOnFocus:true,step:30,stopScrollPropagation:false,timeFormat:"g:ia",typeaheadHighlight:true,useSelect:false,wrapHours:true};var DEFAULT_LANG={am:"am",pm:"pm",AM:"AM",PM:"PM",decimal:".",mins:"mins",hr:"hr",hrs:"hrs"};var Timepicker=function(){function Timepicker(targetEl){var options=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};_classCallCheck(this,Timepicker);this._handleFormatValue=this._handleFormatValue.bind(this);this._handleKeyUp=this._handleKeyUp.bind(this);this.targetEl=targetEl;var attrOptions=Timepicker.extractAttrOptions(targetEl,Object.keys(DEFAULT_SETTINGS));this.settings=this.parseSettings(_objectSpread2(_objectSpread2(_objectSpread2({},DEFAULT_SETTINGS),options),attrOptions))}_createClass(Timepicker,[{key:"hideMe",value:function hideMe(){if(this.settings.useSelect){this.targetEl.blur();return}if(!this.list||!Timepicker.isVisible(this.list)){return}if(this.settings.selectOnBlur){this._selectValue()}this.list.hide();var hideTimepickerEvent=new CustomEvent("hideTimepicker");this.targetEl.dispatchEvent(hideTimepickerEvent)}},{key:"_findRow",value:function _findRow(value){if(!value&&value!==0){return false}var out=false;var value=this.settings.roundingFunction(value,this.settings);if(!this.list){return false}this.list.find("li").each(function(i,obj){var parsed=Number.parseInt(obj.dataset.time);if(Number.isNaN(parsed)){return}if(parsed==value){out=obj;return false}});return out}},{key:"_hideKeyboard",value:function _hideKeyboard(){return(window.navigator.msMaxTouchPoints||"ontouchstart"in document)&&this.settings.disableTouchKeyboard}},{key:"_setTimeValue",value:function _setTimeValue(value,source){if(this.targetEl.nodeName==="INPUT"){if(value!==null||this.targetEl.value!=""){this.targetEl.value=value}var tp=this;var settings=tp.settings;if(settings.useSelect&&source!="select"&&tp.list){tp.list.val(tp._roundAndFormatTime(tp.time2int(value)))}}var selectTimeEvent=new Event("selectTime");if(this.selectedValue!=value){this.selectedValue=value;var changeTimeEvent=new Event("changeTime");var changeEvent=new CustomEvent("change",{detail:"em_timepicker"});if(source=="select"){this.targetEl.dispatchEvent(selectTimeEvent);this.targetEl.dispatchEvent(changeTimeEvent);this.targetEl.dispatchEvent(changeEvent)}else if(["error","initial"].indexOf(source)==-1){this.targetEl.dispatchEvent(changeTimeEvent)}return true}else{if(["error","initial"].indexOf(source)==-1){this.targetEl.dispatchEvent(selectTimeEvent)}return false}}},{key:"_getTimeValue",value:function _getTimeValue(){if(this.targetEl.nodeName==="INPUT"){return this.targetEl.value}else{return this.selectedValue}}},{key:"_selectValue",value:function _selectValue(){var tp=this;var settings=tp.settings;var list=tp.list;var cursor=list.find(".ui-em_timepicker-selected");if(cursor.hasClass("ui-em_timepicker-disabled")){return false}if(!cursor.length){return true}var timeValue=cursor.get(0).dataset.time;if(timeValue){var parsedTimeValue=Number.parseInt(timeValue);if(!Number.isNaN(parsedTimeValue)){timeValue=parsedTimeValue}}if(timeValue!==null){if(typeof timeValue!="string"){timeValue=tp._int2time(timeValue)}tp._setTimeValue(timeValue,"select")}return true}},{key:"time2int",value:function time2int(timeString){if(timeString===""||timeString===null||timeString===undefined)return null;if(timeString instanceof Date){return timeString.getHours()*3600+timeString.getMinutes()*60+timeString.getSeconds()}if(typeof timeString!="string"){return timeString}timeString=timeString.toLowerCase().replace(/[\s\.]/g,"");if(timeString.slice(-1)=="a"||timeString.slice(-1)=="p"){timeString+="m"}var pattern=/^(([^0-9]*))?([0-9]?[0-9])(([0-5][0-9]))?(([0-5][0-9]))?(([^0-9]*))$/;var hasDelimetersMatch=timeString.match(/\W/);if(hasDelimetersMatch){pattern=/^(([^0-9]*))?([0-9]?[0-9])(\W+([0-5][0-9]?))?(\W+([0-5][0-9]))?(([^0-9]*))$/}var time=timeString.match(pattern);if(!time){return null}var hour=parseInt(time[3]*1,10);var ampm=time[2]||time[9];var hours=hour;var minutes=time[5]*1||0;var seconds=time[7]*1||0;if(!ampm&&time[3].length==2&&time[3][0]=="0"){ampm="am"}if(hour<=12&&ampm){ampm=ampm.trim();var isPm=ampm==this.settings.lang.pm||ampm==this.settings.lang.PM;if(hour==12){hours=isPm?12:0}else{hours=hour+(isPm?12:0)}}else{var t=hour*3600+minutes*60+seconds;if(t>=ONE_DAY+(this.settings.show2400?1:0)){if(this.settings.wrapHours===false){return null}hours=hour%24}}var timeInt=hours*3600+minutes*60+seconds;if(hour<12&&!ampm&&this.settings._twelveHourTime&&this.settings.scrollDefault){var delta=timeInt-this.settings.scrollDefault();if(delta<0&&delta>=ONE_DAY/-2){timeInt=(timeInt+ONE_DAY/2)%ONE_DAY}}return timeInt}},{key:"parseSettings",value:function parseSettings(settings){var _this=this;settings.lang=_objectSpread2(_objectSpread2({},DEFAULT_LANG),settings.lang);this.settings=settings;if(settings.minTime){settings.minTime=this.time2int(settings.minTime)}if(settings.maxTime){settings.maxTime=this.time2int(settings.maxTime)}if(settings.listWidth){settings.listWidth=this.time2int(settings.listWidth)}if(settings.durationTime&&typeof settings.durationTime!=="function"){settings.durationTime=this.time2int(settings.durationTime)}if(settings.scrollDefault=="now"){settings.scrollDefault=function(){return settings.roundingFunction(_this.time2int(new Date),settings)}}else if(settings.scrollDefault&&typeof settings.scrollDefault!="function"){var val=settings.scrollDefault;settings.scrollDefault=function(){return settings.roundingFunction(_this.time2int(val),settings)}}else if(settings.minTime){settings.scrollDefault=function(){return settings.roundingFunction(settings.minTime,settings)}}if(typeof settings.timeFormat==="string"&&settings.timeFormat.match(/[gh]/)){settings._twelveHourTime=true}if(settings.showOnFocus===false&&settings.showOn.indexOf("focus")!=-1){settings.showOn.splice(settings.showOn.indexOf("focus"),1)}if(!settings.disableTimeRanges){settings.disableTimeRanges=[]}if(settings.disableTimeRanges.length>0){for(var i in settings.disableTimeRanges){settings.disableTimeRanges[i]=[this.time2int(settings.disableTimeRanges[i][0]),this.time2int(settings.disableTimeRanges[i][1])]}settings.disableTimeRanges=settings.disableTimeRanges.sort(function(a,b){return a[0]-b[0]});for(var i=settings.disableTimeRanges.length-1;i>0;i--){if(settings.disableTimeRanges[i][0]<=settings.disableTimeRanges[i-1][1]){settings.disableTimeRanges[i-1]=[Math.min(settings.disableTimeRanges[i][0],settings.disableTimeRanges[i-1][0]),Math.max(settings.disableTimeRanges[i][1],settings.disableTimeRanges[i-1][1])];settings.disableTimeRanges.splice(i,1)}}}return settings}},{key:"_disableTextInputHandler",value:function _disableTextInputHandler(e){switch(e.keyCode){case 13:case 9:return;default:e.preventDefault()}}},{key:"_int2duration",value:function _int2duration(seconds,step){seconds=Math.abs(seconds);var minutes=Math.round(seconds/60),duration=[],hours,mins;if(minutes<60){duration=[minutes,this.settings.lang.mins]}else{hours=Math.floor(minutes/60);mins=minutes%60;if(step==30&&mins==30){hours+=this.settings.lang.decimal+5}duration.push(hours);duration.push(hours==1?this.settings.lang.hr:this.settings.lang.hrs);if(step!=30&&mins){duration.push(mins);duration.push(this.settings.lang.mins)}}return duration.join(" ")}},{key:"_roundAndFormatTime",value:function _roundAndFormatTime(seconds){seconds=this.settings.roundingFunction(seconds,this.settings);if(seconds!==null){return this._int2time(seconds)}}},{key:"_int2time",value:function _int2time(timeInt){if(typeof timeInt!="number"){return null}var seconds=parseInt(timeInt%60),minutes=parseInt(timeInt/60%60),hours=parseInt(timeInt/(60*60)%24);var time=new Date(1970,0,2,hours,minutes,seconds,0);if(isNaN(time.getTime())){return null}if(typeof this.settings.timeFormat==="function"){return this.settings.timeFormat(time)}var output="";var hour,code;for(var i=0;i<this.settings.timeFormat.length;i++){code=this.settings.timeFormat.charAt(i);switch(code){case"a":output+=time.getHours()>11?this.settings.lang.pm:this.settings.lang.am;break;case"A":output+=time.getHours()>11?this.settings.lang.PM:this.settings.lang.AM;break;case"g":hour=time.getHours()%12;output+=hour===0?"12":hour;break;case"G":hour=time.getHours();if(timeInt===ONE_DAY)hour=this.settings.show2400?24:0;output+=hour;break;case"h":hour=time.getHours()%12;if(hour!==0&&hour<10){hour="0"+hour}output+=hour===0?"12":hour;break;case"H":hour=time.getHours();if(timeInt===ONE_DAY)hour=this.settings.show2400?24:0;output+=hour>9?hour:"0"+hour;break;case"i":var minutes=time.getMinutes();output+=minutes>9?minutes:"0"+minutes;break;case"s":seconds=time.getSeconds();output+=seconds>9?seconds:"0"+seconds;break;case"\\":i++;output+=this.settings.timeFormat.charAt(i);break;default:output+=code}}return output}},{key:"_setSelected",value:function _setSelected(){var list=this.list;list.find("li").removeClass("ui-em_timepicker-selected");var timeValue=this.time2int(this._getTimeValue());if(timeValue===null){return}var selected=this._findRow(timeValue);if(selected){var selectedRect=selected.getBoundingClientRect();var listRect=list.get(0).getBoundingClientRect();var topDelta=selectedRect.top-listRect.top;if(topDelta+selectedRect.height>listRect.height||topDelta<0){var newScroll=list.scrollTop()+(selectedRect.top-listRect.top)-selectedRect.height;list.scrollTop(newScroll)}var parsed=Number.parseInt(selected.dataset.time);if(this.settings.forceRoundTime||parsed===timeValue){selected.classList.add("ui-em_timepicker-selected")}}}},{key:"_isFocused",value:function _isFocused(el){return el===document.activeElement}},{key:"_handleFormatValue",value:function _handleFormatValue(e){if(e&&e.detail=="em_timepicker"){return}this._formatValue(e)}},{key:"_formatValue",value:function _formatValue(e,origin){if(this.targetEl.value===""){this._setTimeValue(null,origin);return}if(this._isFocused(this.targetEl)&&(!e||e.type!="change")){return}var settings=this.settings;var seconds=this.time2int(this.targetEl.value);if(seconds===null){var timeFormatErrorEvent=new CustomEvent("timeFormatError");this.targetEl.dispatchEvent(timeFormatErrorEvent);return}var rangeError=false;if(settings.minTime!==null&&settings.maxTime!==null&&(seconds<settings.minTime||seconds>settings.maxTime)){rangeError=true}var _iterator=_createForOfIteratorHelper(settings.disableTimeRanges),_step;try{for(_iterator.s();!(_step=_iterator.n()).done;){var range=_step.value;if(seconds>=range[0]&&seconds<range[1]){rangeError=true;break}}}catch(err){_iterator.e(err)}finally{_iterator.f()}if(settings.forceRoundTime){var roundSeconds=settings.roundingFunction(seconds,settings);if(roundSeconds!=seconds){seconds=roundSeconds;origin=null}}var prettyTime=this._int2time(seconds);if(rangeError){this._setTimeValue(prettyTime);var timeRangeErrorEvent=new CustomEvent("timeRangeError");this.targetEl.dispatchEvent(timeRangeErrorEvent)}else{this._setTimeValue(prettyTime,origin)}}},{key:"_generateNoneElement",value:function _generateNoneElement(optionValue,useSelect){var label,className,value;if(_typeof(optionValue)=="object"){label=optionValue.label;className=optionValue.className;value=optionValue.value}else if(typeof optionValue=="string"){label=optionValue;value=""}else{$.error("Invalid noneOption value")}var el;if(useSelect){el=document.createElement("option");el.value=value}else{el=document.createElement("li");el.dataset.time=String(value)}el.innerText=label;el.classList.add(className);return el}},{key:"_handleKeyUp",value:function _handleKeyUp(e){if(!this.list||!Timepicker.isVisible(this.list)||this.settings.disableTextInput){return true}if(e.type==="paste"||e.type==="cut"){setTimeout(function(){if(this.settings.typeaheadHighlight){this._setSelected()}else{this.list.hide()}},0);return}switch(e.keyCode){case 96:case 97:case 98:case 99:case 100:case 101:case 102:case 103:case 104:case 105:case 48:case 49:case 50:case 51:case 52:case 53:case 54:case 55:case 56:case 57:case 65:case 77:case 80:case 186:case 8:case 46:if(this.settings.typeaheadHighlight){this._setSelected()}else{this.list.hide()}break}}}],[{key:"extractAttrOptions",value:function extractAttrOptions(element,keys){var output={};var _iterator2=_createForOfIteratorHelper(keys),_step2;try{for(_iterator2.s();!(_step2=_iterator2.n()).done;){var key=_step2.value;if(key in element.dataset){output[key]=element.dataset[key]}}}catch(err){_iterator2.e(err)}finally{_iterator2.f()}return output}},{key:"isVisible",value:function isVisible(elem){var el=elem[0];return el.offsetWidth>0&&el.offsetHeight>0}},{key:"hideAll",value:function hideAll(){var _iterator3=_createForOfIteratorHelper(document.getElementsByClassName("ui-em_timepicker-input")),_step3;try{for(_iterator3.s();!(_step3=_iterator3.n()).done;){var el=_step3.value;var tp=el.em_timepickerObj;if(tp){tp.hideMe()}}}catch(err){_iterator3.e(err)}finally{_iterator3.f()}}}]);return Timepicker}();(function(factory){if((typeof exports==="undefined"?"undefined":_typeof(exports))==="object"&&exports&&(typeof module==="undefined"?"undefined":_typeof(module))==="object"&&module&&module.exports===exports){factory(require("jquery"))}else if(typeof define==="function"&&define.amd){define(["jquery"],factory)}else{factory(jQuery)}})(function($){var _lang={};var methods={init:function init(options){return this.each(function(){var self=$(this);var tp=new Timepicker(this,options);var settings=tp.settings;_lang=settings.lang;this.em_timepickerObj=tp;self.addClass("ui-em_timepicker-input");if(settings.useSelect){_render(self)}else{self.prop("autocomplete","off");if(settings.showOn){for(var i in settings.showOn){self.on(settings.showOn[i]+".em_timepicker",methods.show)}}self.on("change.em_timepicker",tp._handleFormatValue);self.on("keydown.em_timepicker",_keydownhandler);self.on("keyup.em_timepicker",tp._handleKeyUp);if(settings.disableTextInput){self.on("keydown.em_timepicker",tp._disableTextInputHandler)}self.on("cut.em_timepicker",tp._handleKeyUp);self.on("paste.em_timepicker",tp._handleKeyUp);tp._formatValue(null,"initial")}})},show:function show(e){var self=$(this);var tp=self[0].em_timepickerObj;var settings=tp.settings;if(e){e.preventDefault()}if(settings.useSelect){tp.list.trigger("focus");return}if(tp._hideKeyboard()){self.trigger("blur")}var list=tp.list;if(self.prop("readonly")){return}if(!list||list.length===0||typeof settings.durationTime==="function"){_render(self);list=tp.list}if(Timepicker.isVisible(list)){return}if(self.is("input")){tp.selectedValue=self.val()}tp._setSelected();Timepicker.hideAll();if(typeof settings.listWidth=="number"){list.width(self.outerWidth()*settings.listWidth)}list.show();var listOffset={};if(settings.orientation.match(/r/)){listOffset.left=self.offset().left+self.outerWidth()-list.outerWidth()+parseInt(list.css("marginLeft").replace("px",""),10)}else if(settings.orientation.match(/l/)){listOffset.left=self.offset().left+parseInt(list.css("marginLeft").replace("px",""),10)}else if(settings.orientation.match(/c/)){listOffset.left=self.offset().left+(self.outerWidth()-list.outerWidth())/2+parseInt(list.css("marginLeft").replace("px",""),10)}var verticalOrientation;if(settings.orientation.match(/t/)){verticalOrientation="t"}else if(settings.orientation.match(/b/)){verticalOrientation="b"}else if(self.offset().top+self.outerHeight(true)+list.outerHeight()>$(window).height()+$(window).scrollTop()){verticalOrientation="t"}else{verticalOrientation="b"}if(verticalOrientation=="t"){list.addClass("ui-em_timepicker-positioned-top");listOffset.top=self.offset().top-list.outerHeight()+parseInt(list.css("marginTop").replace("px",""),10)}else{list.removeClass("ui-em_timepicker-positioned-top");listOffset.top=self.offset().top+self.outerHeight()+parseInt(list.css("marginTop").replace("px",""),10)}list.offset(listOffset);var selected=list.find(".ui-em_timepicker-selected");if(!selected.length){var timeInt=tp.time2int(tp._getTimeValue());if(timeInt!==null){selected=$(tp._findRow(timeInt))}else if(settings.scrollDefault){selected=$(tp._findRow(settings.scrollDefault()))}}if(!selected.length||selected.hasClass("ui-em_timepicker-disabled")){selected=list.find("li:not(.ui-em_timepicker-disabled):first")}if(selected&&selected.length){var topOffset=list.scrollTop()+selected.position().top-selected.outerHeight();list.scrollTop(topOffset)}else{list.scrollTop(0)}if(settings.stopScrollPropagation){$(document).on("wheel.ui-em_timepicker",".ui-em_timepicker-wrapper",function(e){e.preventDefault();var currentScroll=$(this).scrollTop();$(this).scrollTop(currentScroll+e.originalEvent.deltaY)})}$(document).on("mousedown.ui-em_timepicker",_closeHandler);$(window).on("resize.ui-em_timepicker",_closeHandler);if(settings.closeOnWindowScroll){$(document).on("scroll.ui-em_timepicker",_closeHandler)}self.trigger("showTimepicker");return this},hide:function hide(e){var tp=this[0].em_timepickerObj;if(tp){tp.hideMe()}Timepicker.hideAll();return this},option:function option(key,value){if(typeof key=="string"&&typeof value=="undefined"){var tp=this[0].em_timepickerObj;return tp.settings[key]}return this.each(function(){var self=$(this);var tp=self[0].em_timepickerObj;var settings=tp.settings;var list=tp.list;if(_typeof(key)=="object"){settings=$.extend(settings,key)}else if(typeof key=="string"){settings[key]=value}settings=tp.parseSettings(settings);tp.settings=settings;tp._formatValue({type:"change"},"initial");if(list){list.remove();tp.list=null}if(settings.useSelect){_render(self)}})},getSecondsFromMidnight:function getSecondsFromMidnight(){var tp=this[0].em_timepickerObj;return tp.time2int(tp._getTimeValue())},getTime:function getTime(relative_date){var tp=this[0].em_timepickerObj;var time_string=tp._getTimeValue();if(!time_string){return null}var offset=tp.time2int(time_string);if(offset===null){return null}if(!relative_date){relative_date=new Date}var time=new Date(relative_date);time.setHours(offset/3600);time.setMinutes(offset%3600/60);time.setSeconds(offset%60);time.setMilliseconds(0);return time},isVisible:function isVisible(){var tp=this[0].em_timepickerObj;return!!(tp&&tp.list&&Timepicker.isVisible(tp.list))},setTime:function setTime(value){var tp=this[0].em_timepickerObj;var settings=tp.settings;if(settings.forceRoundTime){var prettyTime=tp._roundAndFormatTime(tp.time2int(value))}else{var prettyTime=tp._int2time(tp.time2int(value))}if(value&&prettyTime===null&&settings.noneOption){prettyTime=value}tp._setTimeValue(prettyTime,"initial");tp._formatValue({type:"change"},"initial");if(tp&&tp.list){tp._setSelected()}return this},remove:function remove(){var self=this;if(!self.hasClass("ui-em_timepicker-input")){return}var tp=self[0].em_timepickerObj;var settings=tp.settings;self.removeAttr("autocomplete","off");self.removeClass("ui-em_timepicker-input");self.removeData("em_timepicker-obj");self.off(".em_timepicker");if(tp.list){tp.list.remove()}if(settings.useSelect){self.show()}tp.list=null;return this}};function _render(self){var tp=self[0].em_timepickerObj;var list=tp.list;var settings=tp.settings;if(list&&list.length){list.remove();tp.list=null}if(settings.useSelect){list=$("<select></select>",{class:"ui-em_timepicker-select"});if(self.attr("name")){list.attr("name","ui-em_timepicker-"+self.attr("name"))}var wrapped_list=list}else{list=$("<ul></ul>",{class:"ui-em_timepicker-list"});var wrapped_list=$("<div></div>",{class:"ui-em_timepicker-wrapper",tabindex:-1});wrapped_list.css({display:"none",position:"absolute"}).append(list)}if(settings.noneOption){if(settings.noneOption===true){settings.noneOption=settings.useSelect?"Time...":"None"}if($.isArray(settings.noneOption)){for(var i in settings.noneOption){if(parseInt(i,10)==i){var noneElement=tp._generateNoneElement(settings.noneOption[i],settings.useSelect);list.append(noneElement)}}}else{var noneElement=tp._generateNoneElement(settings.noneOption,settings.useSelect);list.append(noneElement)}}if(settings.className){wrapped_list.addClass(settings.className)}if((settings.minTime!==null||settings.durationTime!==null)&&settings.showDuration){var stepval=typeof settings.step=="function"?"function":settings.step;wrapped_list.addClass("ui-em_timepicker-with-duration");wrapped_list.addClass("ui-em_timepicker-step-"+settings.step)}var durStart=settings.minTime;if(typeof settings.durationTime==="function"){durStart=tp.time2int(settings.durationTime())}else if(settings.durationTime!==null){durStart=settings.durationTime}var start=settings.minTime!==null?settings.minTime:0;var end=settings.maxTime!==null?settings.maxTime:start+ONE_DAY-1;if(end<start){end+=ONE_DAY}if(end===ONE_DAY-1&&$.type(settings.timeFormat)==="string"&&settings.show2400){end=ONE_DAY}var dr=settings.disableTimeRanges;var drCur=0;var drLen=dr.length;var stepFunc=settings.step;if(typeof stepFunc!="function"){stepFunc=function stepFunc(){return settings.step}}for(var i=start,j=0;i<=end;j++,i+=stepFunc(j)*60){var timeInt=i;var timeString=tp._int2time(timeInt);if(settings.useSelect){var row=$("<option></option>",{value:timeString});row.text(timeString)}else{var row=$("<li></li>");row.addClass(timeInt%ONE_DAY<ONE_DAY/2?"ui-em_timepicker-am":"ui-em_timepicker-pm");row.attr("data-time",roundingFunction(timeInt,settings));row.text(timeString)}if((settings.minTime!==null||settings.durationTime!==null)&&settings.showDuration){var durationString=tp._int2duration(i-durStart,settings.step);if(settings.useSelect){row.text(row.text()+" ("+durationString+")")}else{var duration=$("<span></span>",{class:"ui-em_timepicker-duration"});duration.text(" ("+durationString+")");row.append(duration)}}if(drCur<drLen){if(timeInt>=dr[drCur][1]){drCur+=1}if(dr[drCur]&&timeInt>=dr[drCur][0]&&timeInt<dr[drCur][1]){if(settings.useSelect){row.prop("disabled",true)}else{row.addClass("ui-em_timepicker-disabled")}}}list.append(row)}wrapped_list.data("em_timepicker-input",self);tp.list=wrapped_list;if(settings.useSelect){if(self.val()){list.val(tp._roundAndFormatTime(tp.time2int(self.val())))}list.on("focus",function(){$(this).data("em_timepicker-input").trigger("showTimepicker")});list.on("blur",function(){$(this).data("em_timepicker-input").trigger("hideTimepicker")});list.on("change",function(){tp._setTimeValue($(this).val(),"select")});tp._setTimeValue(list.val(),"initial");self.hide().after(list)}else{var appendTo=settings.appendTo;if(typeof appendTo==="string"){appendTo=$(appendTo)}else if(typeof appendTo==="function"){appendTo=appendTo(self)}appendTo.append(wrapped_list);tp._setSelected();list.on("mousedown click","li",function(e){self.off("focus.em_timepicker");self.on("focus.em_timepicker-ie-hack",function(){self.off("focus.em_timepicker-ie-hack");self.on("focus.em_timepicker",methods.show)});if(!tp._hideKeyboard()){self[0].focus()}list.find("li").removeClass("ui-em_timepicker-selected");$(this).addClass("ui-em_timepicker-selected");if(tp._selectValue()){self.trigger("hideTimepicker");list.on("mouseup.em_timepicker click.em_timepicker","li",function(e){list.off("mouseup.em_timepicker click.em_timepicker");wrapped_list.hide()})}})}}function _closeHandler(e){if(e.target==window){return}var target=$(e.target);if(target.closest(".ui-em_timepicker-input").length||target.closest(".ui-em_timepicker-wrapper").length){return}Timepicker.hideAll();$(document).off(".ui-em_timepicker");$(window).off(".ui-em_timepicker")}function _keydownhandler(e){var self=$(this);var tp=self[0].em_timepickerObj;var list=tp.list;if(!list||!Timepicker.isVisible(list)){if(e.keyCode==40){methods.show.call(self.get(0));list=tp.list;if(!tp._hideKeyboard()){self.trigger("focus")}}else{return true}}switch(e.keyCode){case 13:if(tp._selectValue()){tp._formatValue({type:"change"});tp.hideMe()}e.preventDefault();return false;case 38:var selected=list.find(".ui-em_timepicker-selected");if(!selected.length){list.find("li").each(function(i,obj){if($(obj).position().top>0){selected=$(obj);return false}});selected.addClass("ui-em_timepicker-selected")}else if(!selected.is(":first-child")){selected.removeClass("ui-em_timepicker-selected");selected.prev().addClass("ui-em_timepicker-selected");if(selected.prev().position().top<selected.outerHeight()){list.scrollTop(list.scrollTop()-selected.outerHeight())}}return false;case 40:selected=list.find(".ui-em_timepicker-selected");if(selected.length===0){list.find("li").each(function(i,obj){if($(obj).position().top>0){selected=$(obj);return false}});selected.addClass("ui-em_timepicker-selected")}else if(!selected.is(":last-child")){selected.removeClass("ui-em_timepicker-selected");selected.next().addClass("ui-em_timepicker-selected");if(selected.next().position().top+2*selected.outerHeight()>list.outerHeight()){list.scrollTop(list.scrollTop()+selected.outerHeight())}}return false;case 27:list.find("li").removeClass("ui-em_timepicker-selected");tp.hideMe();break;case 9:tp.hideMe();break;default:return true}}$.fn.em_timepicker=function(method){if(!this.length)return this;if(methods[method]){if(!this.hasClass("ui-em_timepicker-input")){return this}return methods[method].apply(this,Array.prototype.slice.call(arguments,1))}else if(_typeof(method)==="object"||!method){return methods.init.apply(this,arguments)}else{$.error("Method "+method+" does not exist on jQuery.em_timepicker")}};$.fn.em_timepicker.defaults=DEFAULT_SETTINGS})})();
\ No newline at end of file
diff --git a/multilingual/em-ml-bookings.php b/multilingual/em-ml-bookings.php
index 9f7ea6a..87d870f 100644
--- a/multilingual/em-ml-bookings.php
+++ b/multilingual/em-ml-bookings.php
@@ -24,7 +24,10 @@ public static function init(){
 			EM_ML_Bookings::$ignore_post_ids[] = $post_id;
 		});
     }
-    
+	
+	/**
+	 * @param EM_Booking $EM_Booking
+	 */
     public static function em_booking_email_before_send( $EM_Booking ){
     	if( $EM_Booking->language  && get_locale() !== $EM_Booking->language ){
             static::$displaying_locale = EM_ML::$current_language;
@@ -115,8 +118,8 @@ public static function em_booking_form_footer($EM_Event){
 	 * @return EM_Event
 	 */
 	public static function em_booking_get_event($EM_Event, $EM_Booking){
-	    if( EM_ML::get_the_language($EM_Event) != get_locale() ){
-		    $EM_Event = EM_ML::get_translation($EM_Event, get_locale());
+	    if( EM_ML::get_the_language($EM_Event) != $EM_Booking->language ){
+		    $EM_Event = EM_ML::get_translation($EM_Event, $EM_Booking->language);
 		    $EM_Booking->event = $EM_Event; // so that we always fire this filter each time get_event() is called
 		}
 	    return $EM_Event;
diff --git a/multilingual/em-ml-io.php b/multilingual/em-ml-io.php
index 04ea165..52ce5bd 100644
--- a/multilingual/em-ml-io.php
+++ b/multilingual/em-ml-io.php
@@ -30,8 +30,9 @@ public static function init(){
 	    add_filter('em_ticket_delete', 'EM_ML_IO::ticket_delete', 10, 2);
         //Loading
         add_filter('em_event_get_location','EM_ML_IO::event_get_location',10,2);
+	    add_filter('em_event_get_event_location','EM_ML_IO::event_get_event_location',10,2);
         //Duplication
-	    //add_action('em_event_duplicate_pre', 'EM_ML_IO::em_event_duplicate_pre', 10, 1);
+	    add_action('em_event_duplicate', 'EM_ML_IO::event_duplicate', 100, 2);
         add_filter('em_event_duplicate_url','EM_ML_IO::event_duplicate_url',10, 2);
     }
     
@@ -53,6 +54,23 @@ public static function event_get_location( $EM_Location, $EM_Event ){
         return $EM_Location;
     }
 	
+	/**
+	 * Loads original event location and merges in data to the translated event location
+	 * @param EM_Event_Locations\Event_Location $Event_Location
+	 * @param EM_Event $EM_Event
+	 * @return mixed
+	 */
+    public static function event_get_event_location( $Event_Location, $EM_Event ){
+	    if( !EM_ML::is_original($EM_Event) ) {
+		    // get original event object
+		    $event = EM_ML::get_original_event($EM_Event);
+		    // merge any data from original event, overwritten by translated event data
+		    $event_location_data = array_merge($event->get_event_location()->data, $Event_Location->data);
+		    $Event_Location->data = $event_location_data;
+	    }
+        return $Event_Location;
+    }
+	
 	/**
 	 * @param EM_Event $EM_Event The event to merge original meta into
 	 * @param EM_Event $event The original event
@@ -66,6 +84,8 @@ public static function event_merge_original_meta( $EM_Event, $event ){
 		$EM_Event->recurrence  = $event->recurrence ;
 		$EM_Event->post_type  = $event->post_type ;
 		$EM_Event->location_id  = $event->location_id ;
+		$EM_Event->event_location_type = $event->event_location_type;
+	    $EM_Event->event_location = $event->event_location;
 		$EM_Event->location = false;
 		$EM_Event->event_all_day  = $event->event_all_day ;
 		$EM_Event->event_start_time  = $event->event_start_time ;
@@ -188,11 +208,38 @@ public static function event_duplicate_url($url, $EM_Event){
 	    return $url;
 	}
 	
-	/*
-	 * Ensures events lose parent when duplicated if they're a translation.
+	/**
+	 * When an event is duplicated, we need to get the original event's translations and copy them as duplicates of the current event.
+	 * An assumption is made here, which is that the event that was duplicated already is the original, since in ML mode we should be only duplicating the original language.
+	 *
+	 * @param EM_Event|false $result
+	 * @param EM_Event $EM_Event
+	 * @return EM_Event|boolean
 	 */
-	public static function em_event_duplicate_pre( $EM_Event ){
-		$EM_Event->event_parent = null;
+	public static function event_duplicate($result, $EM_Event){
+		global $EM_ML_DUPLICATING;
+		// chehck we're on a newer WPML version, if we're using WPML, this will be depracated eventually
+		if( defined('EM_WPML_VERSION') && version_compare(EM_WPML_VERSION, '2.0.2.1', '<=') ) return $result;
+		if( $result !== false && empty($EM_ML_DUPLICATING) ){
+			if( !EM_ML::is_original($EM_Event) ) return $result; // we only duplicate the original event
+			//get the translation info of the duplicated event, for use later on
+			$event = $result; /* @var $event EM_Event */
+			$event_id = $event->event_id; // for use later
+			// get translations and loop through them to duplicate
+			$translations = EM_ML::get_event_translations($EM_Event);
+			foreach( $translations as $lang_code => $translation ){
+				//check that we're not in the original language, as that has been duplicated already
+				if( $translation->event_id != $EM_Event->event_id ){
+					//get the translation of original event that was duplicated if exists and duplicate it
+					$event = em_get_event($translation->event_id);
+					$EM_ML_DUPLICATING = true;
+					$event->event_parent = $event_id; // change parent to new event
+					$event->duplicate();
+					$EM_ML_DUPLICATING = false;
+				}
+			}
+		}
+		return $result;
 	}
 	
 	/**
diff --git a/multilingual/em-ml-options.php b/multilingual/em-ml-options.php
index 390a69b..4575bbe 100644
--- a/multilingual/em-ml-options.php
+++ b/multilingual/em-ml-options.php
@@ -139,6 +139,7 @@ public function __construct(){
 				'dbem_booking_button_msg_already_booked',
 				'dbem_booking_button_msg_error',
 				'dbem_booking_button_msg_full',
+				'dbem_booking_button_msg_closed',
 				'dbem_booking_button_msg_cancel',
 				'dbem_booking_button_msg_canceling',
 				'dbem_booking_button_msg_cancelled',
diff --git a/multilingual/em-ml.php b/multilingual/em-ml.php
index 46c9c4b..0a74663 100644
--- a/multilingual/em-ml.php
+++ b/multilingual/em-ml.php
@@ -111,6 +111,9 @@ public static function wp_switch_locale( $locale ){
 	public static function switch_locale( $locale ){
 		self::$current_language_restore = self::$current_language;
 		switch_to_locale($locale);
+		do_action('em_ml_switch_locale', $locale);
+		// short-circuit determininig the locale for EM-specific purposes
+		add_filter('pre_determine_locale', 'EM_ML::pre_determine_locale', 999999, 1);
 	}
 	
 	public static function restore_locale(){
@@ -127,6 +130,23 @@ public static function restore_locale(){
 				}
 			}
 		}
+		do_action('em_ml_restore_locale', self::$current_language);
+		// short-circuit determininig the locale for EM-specific purposes
+		remove_filter('pre_determine_locale', 'EM_ML::pre_determine_locale', 999999);
+	}
+	
+	/**
+	 * Quirky fix for situations where admins are triggering something requiring translations in the backend whilst EM_ML has switched locales temporarily.
+	 * For example, triggering an email booking resend in a translated language; In this case the loaded translation file will always be that of the admin
+	 * preferred locale rather than the get_locale() which is not what we'd want in these situations. Therefore when switching language this hook is active.
+	 * @param $locale
+	 * @return mixed|string
+	 */
+	public static function pre_determine_locale( $locale ){
+		if( is_admin() && EM_ML::$current_language_restore !== null ){
+			return self::$current_language;
+		}
+		return $locale;
 	}
 
     /**
diff --git a/readme.txt b/readme.txt
index 71c435e..e3433af 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,8 +4,8 @@ Donate link: http://wp-events-plugin.com
 Tags: bookings, calendar, tickets, events, buddypress, event management, google maps, maps, locations, registration, zoom
 Text Domain: events-manager
 Requires at least: 5.2
-Tested up to: 5.6
-Stable tag: 5.9.910
+Tested up to: 5.8
+Stable tag: 5.10.1
 Requires PHP: 5.3
 
 Fully featured event registration management including recurring events, locations management, calendar, Google map integration, booking management
@@ -63,9 +63,13 @@ We provide the tools to [help you be GDPR compliant](http://wp-events-plugin.com
 * settings to control what can be exported/erased as well as where/when to place consent requests
 * sample text for your site privacy policy describing what Events Manager does with personal data
 
-= Go Pro =
-We have a premium "Pro" add-on for Events Manager which not only demonstrates the flexibility of Events Manager, but also adds some important features including but not limited to:
+= Premium Features =
 
+*NEW* Check out our [WooCommerce add-on](https://wp-events-plugin.com/woocommerce/)! Sell bookings directly with WooCommerce.
+
+We have a premium [Pro add-on for Events Manager](http://eventsmanagerpro.com/gopro/) which not only demonstrates the flexibility of Events Manager, but also adds some important features including but not limited to:
+
+* WooCommerce integration included FREE (limited-time offer)
 * PayPal, Stripe, Authorize.net and Offline Payments
 * Custom booking forms
 * Individual Attendee custom forms
@@ -115,6 +119,61 @@ See our [FAQ](http://wp-events-plugin.com/documentation/faq/) page, which is upd
 6. Manage attendees with various booking reports
 
 == Changelog ==
+= 5.10.1 = 
+* 5.10 with GGG mods
+
+= 5.10 =
+* fixed a minor PHPMailer PHP warning tiggered when mailing errors occur
+* fixed date validation errors restting available from/until times to 12AM for tickets
+* fixed WP Fullcalendar style tweak for tip image
+* removed loading of EM_Person upon construct of EM_Booking to prevent unecessary pre-loading
+* fixed bookings closed text not being translatable by ML plugins
+* fixed multilingual translation failures when triggering actions like ML booking emails as an admin
+* added em_ml_swiitch_locale and em_ml_restore_locale actions for ML plugins that don't hook into WP's switch_locale
+* fixed potential ML translation issues when switching translated event objects in a booking
+* optimized translated event switching in booking objects
+* added em_pre_taxonomy_template, em_pre_{taxonomy_name}_taxonomy_template and em_taxonomy_template
+* added temporary fix for compatibility issue with/caused by BuddyBoss
+* fixed PHP warnings caused by dev version update checks, also removed em_org_dev_version_slugs filter in place of em_org_dev_versions
+* added em_bookings_single_details_footer filter
+* added extra email trimming to prevent mail errors due to errant whitespaces
+* added em_ticket_get_price_without_tax filter
+* fixed #@_{...} placeholders still showing if end date is the same
+* fixed email fatal errors when password reset is disabled by other plugins or custom code
+* fixed caching issues with custom code hooking into em_event by firing the action before caching occurs
+* fixed reported issues with Elementor by writing $content into event and location object post_content properties (kudos to @martinneumannat)
+* fixed CZY currency symbols not being included
+* fixed dbem_maps_text_format and potentially other formats retrieved via AJAX not being overridable using our em_formats_filter filter
+* fixed bookings="0" not returning non-bookable events in shortcodes
+* fixed google ical link using http://
+* fixed EM_Person::get_summary() returning mixed up array key/values (props @duisterdenhaag)
+* removed outline style rules from CSS to help with WCAG compliance
+
+= 5.9.11.3 =
+* fixed issues with WooCommerce add-on circumventing currency formatting
+* changed various AJAX/Admin actions to fire on wp_loaded rather than init action to allow better plugin compatibility
+* added $where param to EM_Admin_Notice constructor
+* added __sleep and __wakeup functions to EM_Booking and EM_Ticket_Booking for more optimal serialization
+* fixed timepicker conflict issues with other plugins due to shared common function names
+
+= 5.9.11  =
+* updated JS to remove any deprecated functionality in jQuery v3.5,
+* changed timepicker library to (timepicker)[https://github.com/jonthornton/jquery-timepicker/]
+* added $target to Event_Location->output() function parameters
+* fixed EM_Event->output() errors causing booking emails to fail if containing #_EVENTLOCATION placeholders for non-virtual events
+* added $send_email and $ignore_spaces params to EM_Bookings::set_status()
+* added em_booking_admin action to top of single booking admin area
+* added update_meta() function to EM_Booking,
+* fixed some minor PHP warnings,
+* added ticket availability re-check during EM_Booking::validate() for bookings stored in session before saving
+
+= 5.9.10 =
+* fixed event locations not getting synced with translations (WPML) and requires re-saving events to take effect
+* fixed incorrect dates in calendars for some specific server setups - props to @davidkryzaniak
+* fixed multilingual event duplication issues
+* tweaked dev updates checker to allow other .org plugins to be checked if added to array passed by em_org_dev_version_slugs filter
+* fixed a PHP 8.0 deprecated line of code
+
 = 5.9.910 =
 * 5.9.9 with GGG mods
 
diff --git a/templates/forms/event/bookings-ticket-form.php b/templates/forms/event/bookings-ticket-form.php
index 08b23cb..c119a99 100755
--- a/templates/forms/event/bookings-ticket-form.php
+++ b/templates/forms/event/bookings-ticket-form.php
@@ -52,7 +52,7 @@
 					</select>
 				</div>
 				<?php echo esc_html_x('at', 'time','events-manager'); ?>
-				<input id="start-time" class="em-time-input em-time-start" type="text" size="8" maxlength="8" name="em_tickets[<?php echo $col_count; ?>][ticket_start_time]" value="<?php echo ( !empty($EM_Ticket->ticket_start) ) ? $EM_Ticket->start()->format( em_get_hour_format() ):''; ?>" />
+				<input class="em-time-input em-time-start" type="text" size="8" maxlength="8" name="em_tickets[<?php echo $col_count; ?>][ticket_start_time]" value="<?php echo ( !empty($EM_Ticket->ticket_start) ) ? $EM_Ticket->start()->format( em_get_hour_format() ):''; ?>" />
 			</div>
 			<div class="ticket-dates-to">
 				<label title="<?php esc_attr_e('Add a start or end date (or both) to impose time constraints on ticket availability. Leave either blank for no upper/lower limit.','events-manager'); ?>">
@@ -71,7 +71,7 @@
 					</select>
 				</div>
 				<?php echo esc_html_x('at', 'time','events-manager'); ?>
-				<input id="end-time" class="em-time-input em-time-end ticket-times-to-normal" type="text" size="8" maxlength="8" name="em_tickets[<?php echo $col_count; ?>][ticket_end_time]" value="<?php echo ( !empty($EM_Ticket->ticket_end) ) ? $EM_Ticket->end()->format( em_get_hour_format() ):''; ?>" />
+				<input class="em-time-input em-time-end ticket-times-to-normal" type="text" size="8" maxlength="8" name="em_tickets[<?php echo $col_count; ?>][ticket_end_time]" value="<?php echo ( !empty($EM_Ticket->ticket_end) ) ? $EM_Ticket->end()->format( em_get_hour_format() ):''; ?>" />
 			</div>
 		</div>
 		<?php if( !get_option('dbem_bookings_tickets_single') || count($EM_Ticket->get_event()->get_tickets()->tickets) > 1 ): ?>
diff --git a/templates/forms/event/recurring-when.php b/templates/forms/event/recurring-when.php
index 539a9f2..9f7d094 100755
--- a/templates/forms/event/recurring-when.php
+++ b/templates/forms/event/recurring-when.php
@@ -8,9 +8,9 @@
 <div id="em-form-recurrence" class="event-form-recurrence event-form-when">
 	<p class="em-time-range">
 		<?php _e('Events start from','events-manager'); ?>
-		<input id="start-time" class="em-time-input em-time-start" type="text" size="8" maxlength="8" name="event_start_time" value="<?php echo $EM_Event->start()->i18n($hours_format); ?>" />
+		<input class="em-time-input em-time-start" type="text" size="8" maxlength="8" name="event_start_time" value="<?php echo $EM_Event->start()->i18n($hours_format); ?>" />
 		<?php _e('to','events-manager'); ?>
-		<input id="end-time" class="em-time-input em-time-end" type="text" size="8" maxlength="8" name="event_end_time" value="<?php echo $EM_Event->end()->i18n($hours_format); ?>" />
+		<input class="em-time-input em-time-end" type="text" size="8" maxlength="8" name="event_end_time" value="<?php echo $EM_Event->end()->i18n($hours_format); ?>" />
 		<?php _e('All day','events-manager'); ?> <input type="checkbox" class="em-time-allday" name="event_all_day" id="em-time-all-day" value="1" <?php if(!empty($EM_Event->event_all_day)) echo 'checked="checked"'; ?> />
 	</p>
 	<?php if( get_option('dbem_timezone_enabled') ): ?>
diff --git a/templates/forms/event/when-with-recurring.php b/templates/forms/event/when-with-recurring.php
index 7165bf0..d8c7329 100755
--- a/templates/forms/event/when-with-recurring.php
+++ b/templates/forms/event/when-with-recurring.php
@@ -21,9 +21,9 @@
 	<p>
 		<span class="em-recurring-text"><?php _e('Events start from','events-manager'); ?></span>
 		<span class="em-event-text"><?php _e('Event starts at','events-manager'); ?></span>
-		<input id="start-time" class="em-time-input em-time-start" type="text" size="8" maxlength="8" name="event_start_time" value="<?php echo $EM_Event->start()->i18n($hours_format); ?>" />
+		<input class="em-time-input em-time-start" type="text" size="8" maxlength="8" name="event_start_time" value="<?php echo $EM_Event->start()->i18n($hours_format); ?>" />
 		<?php _e('to','events-manager'); ?>
-		<input id="end-time" class="em-time-input em-time-end" type="text" size="8" maxlength="8" name="event_end_time" value="<?php echo $EM_Event->end()->i18n($hours_format); ?>" />
+		<input class="em-time-input em-time-end" type="text" size="8" maxlength="8" name="event_end_time" value="<?php echo $EM_Event->end()->i18n($hours_format); ?>" />
 		<?php _e('All day','events-manager'); ?> <input type="checkbox" class="em-time-allday" name="event_all_day" id="em-time-all-day" value="1" <?php if(!empty($EM_Event->event_all_day)) echo 'checked="checked"'; ?> />
 	</p>
 	<?php if( get_option('dbem_timezone_enabled') ): ?>
@@ -80,7 +80,7 @@
 	<script type="text/javascript">
 	//<![CDATA[
 	jQuery(document).ready( function($) {
-		$('#em-recurrence-checkbox').change(function(){
+		$('#em-recurrence-checkbox').on('change', function(){
 			if( $('#em-recurrence-checkbox').is(':checked') ){
 				$('.em-recurring-text').show();
 				$('.em-event-text').hide();
diff --git a/templates/forms/event/when.php b/templates/forms/event/when.php
index 9efe200..7631175 100755
--- a/templates/forms/event/when.php
+++ b/templates/forms/event/when.php
@@ -14,9 +14,9 @@
 	</p>
 	<p class="em-time-range">
 		<span class="em-event-text"><?php _e('Event starts at','events-manager'); ?></span>
-		<input id="start-time" class="em-time-input em-time-start" type="text" size="8" maxlength="8" name="event_start_time" value="<?php echo $EM_Event->start()->format($hours_format); ?>" />
+		<input class="em-time-input em-time-start" type="text" size="8" maxlength="8" name="event_start_time" value="<?php echo $EM_Event->start()->format($hours_format); ?>" />
 		<?php _e('to','events-manager'); ?>
-		<input id="end-time" class="em-time-input em-time-end" type="text" size="8" maxlength="8" name="event_end_time" value="<?php echo $EM_Event->end()->format($hours_format); ?>" />
+		<input class="em-time-input em-time-end" type="text" size="8" maxlength="8" name="event_end_time" value="<?php echo $EM_Event->end()->format($hours_format); ?>" />
 		<?php _e('All day','events-manager'); ?> <input type="checkbox" class="em-time-all-day" name="event_all_day" id="em-time-all-day" value="1" <?php if(!empty($EM_Event->event_all_day)) echo 'checked="checked"'; ?> />
 	</p>
 	<?php if( get_option('dbem_timezone_enabled') ): ?>
diff --git a/templates/templates/calendar-full.php b/templates/templates/calendar-full.php
index 712119f..396b207 100644
--- a/templates/templates/calendar-full.php
+++ b/templates/templates/calendar-full.php
@@ -12,13 +12,13 @@
 $cal_count = count($calendar['cells']); //to prevent an extra tr
 $col_count = $tot_count = 1; //this counts collumns in the $calendar_array['cells'] array
 $col_max = count($calendar['row_headers']); //each time this collumn number is reached, we create a new collumn, the number of cells should divide evenly by the number of row_headers
-$EM_DateTime = new EM_DateTime($calendar['month_start']);
+$EM_DateTime = new EM_DateTime($calendar['month_start'], 'UTC');
 ?>
 <table class="em-calendar fullcalendar">
 	<thead>
 		<tr>
 			<td><a class="em-calnav full-link em-calnav-prev" href="<?php echo esc_url($calendar['links']['previous_url']); ?>">&lt;&lt;</a></td>
-			<td class="month_name" colspan="5"><?php echo esc_html($EM_DateTime->format(get_option('dbem_full_calendar_month_format'))); ?></td>
+			<td class="month_name" colspan="5"><?php echo esc_html($EM_DateTime->i18n(get_option('dbem_full_calendar_month_format'))); ?></td>
 			<td><a class="em-calnav full-link em-calnav-next" href="<?php echo esc_url($calendar['links']['next_url']); ?>">&gt;&gt;</a></td>
 		</tr>
 	</thead>
diff --git a/templates/templates/calendar-small.php b/templates/templates/calendar-small.php
index f385cae..c7f9500 100644
--- a/templates/templates/calendar-small.php
+++ b/templates/templates/calendar-small.php
@@ -7,13 +7,13 @@
 /* @var array $calendar - contains an array of information regarding the calendar and is used to generate the content */
 /* @var array $args - the arguments passed to EM_Calendar::output() */
 
-$EM_DateTime = new EM_DateTime($calendar['month_start']);
+$EM_DateTime = new EM_DateTime($calendar['month_start'], 'UTC');
 ?>
 <table class="em-calendar">
 	<thead>
 		<tr>
 			<td><a class="em-calnav em-calnav-prev" href="<?php echo esc_url($calendar['links']['previous_url']); ?>" rel="nofollow">&lt;&lt;</a></td>
-			<td class="month_name" colspan="5"><?php echo esc_html($EM_DateTime->format(get_option('dbem_small_calendar_month_format'))); ?></td>
+			<td class="month_name" colspan="5"><?php echo esc_html($EM_DateTime->i18n(get_option('dbem_small_calendar_month_format'))); ?></td>
 			<td><a class="em-calnav em-calnav-next" href="<?php echo esc_url($calendar['links']['next_url']); ?>" rel="nofollow">&gt;&gt;</a></td>
 		</tr>
 	</thead>
diff --git a/templates/templates/search/geo.js b/templates/templates/search/geo.js
index 4897847..ce8d011 100755
--- a/templates/templates/search/geo.js
+++ b/templates/templates/search/geo.js
@@ -85,13 +85,13 @@ function em_geo_search_init(){
 			}else{
 				geo_field_status(false);
 			}
-		}).keyup( function(e) {
+		}).on('keyup', function(e) {
 			if( this.value == '' ){ geo_field_status(false); }
 			else if( wrapper.data('last-search') != this.value ){ geo_field_status('off'); }
 			input.data('last-key', e.which);
 		}).blur( function(e){ //create HTML 5 placeholder effect if not HTML 5
 			if( this.value == '' && !('placeholder' in document.createElement('input')) ) this.value = EM.geo_placeholder;
-		}).focus( function(e){
+		}).on('focus', function(e){
 			if( this.value == EM.geo_placeholder ) this.value='';
 			input.data('last-key', 13);
 		}).attr('placeholder', EM.geo_placeholder);
diff --git a/widgets/em-events.php b/widgets/em-events.php
index 90ad043..1b46107 100644
--- a/widgets/em-events.php
+++ b/widgets/em-events.php
@@ -173,7 +173,7 @@ function form($instance) {
 			<input type="text" id="<?php echo $this->get_field_id('all_events_text'); ?>" name="<?php echo $this->get_field_name('all_events_text'); ?>" value="<?php echo esc_attr( $instance['all_events_text'] ); ?>" >
 		</p>
 		<script type="text/javascript">
-		jQuery('#<?php echo $this->get_field_id('all_events'); ?>').change( function(){
+		jQuery('#<?php echo $this->get_field_id('all_events'); ?>').on('change', function(){
 			if( this.checked ){
 			    jQuery(this).parent().next().show();
 			}else{