diff --git a/README.md b/README.md
index 092ab65..807840a 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ More options are now available:
 * `only_featured=true` // filter for featured posts only
 * `featured_at_top=true` // order featured posts at top
 * `exclude_featured=true` // filter out featured posts
-* `more_info_post_link=true` // force more info button to link to the single post instead of to an external website
+* `more_info_post_link=true` // force the more info button to appear by default & link to the single post instead of to an external website
 
 ## Filters
 
diff --git a/functions.php b/functions.php
index b361038..9006cf1 100644
--- a/functions.php
+++ b/functions.php
@@ -357,7 +357,8 @@ function get_squarecandy_acf_events_address_display( $event, $style = '2line', $
 						endif;
 					}
 				endif;
-				$map_link = apply_filters( 'squarecandy_events_map_link', 'https://www.google.com/maps/search/' . rawurlencode( $map_location ), $map_location );
+				$map_link = $map_link ? 'https://www.google.com/maps/search/' . rawurlencode( $map_location ) : '';
+				$map_link = apply_filters( 'squarecandy_events_map_link', $map_link, $map_location );
 				if ( $map_link ) :
 					$output .= '<a class="button small button-gray button-map" href="' . $map_link . '">';
 					$output .= '<i class="fa fa-map"></i> ' . __( 'map', 'squarecandy-acf-events' );
diff --git a/inc/shortcodes.php b/inc/shortcodes.php
index 6a29a3b..f56a20d 100644
--- a/inc/shortcodes.php
+++ b/inc/shortcodes.php
@@ -205,6 +205,7 @@ function squarecandy_events_func( $atts = array() ) {
 	}
 
 	if ( $compact ) {
+		// this will always override the number set in $atts - seems counterintuituve
 		$args['posts_per_page'] = get_option( 'options_number_of_upcoming' );
 	}