diff --git a/controllers/JsonController.php b/controllers/JsonController.php
index 0e27300..d0b9733 100644
--- a/controllers/JsonController.php
+++ b/controllers/JsonController.php
@@ -609,7 +609,7 @@ class JsonController extends Controller
 					'lng' => floatval($block->lng),
 					'time' => strtotime($block->createdAt),
 					'name' => (string) $block->name,
-					'desc' => (string) $block->description,
+					'description' => nl2br($block->description),
 				);
 			}
 		}
@@ -630,7 +630,7 @@ class JsonController extends Controller
 				}
 
 				$resTracks[] = array(
-					'name' => (string) $block->name,
+					'name' => (string) $track->name,
 					'length' => 0,
 					'latlngs' => $resLatlngs,
 				);
diff --git a/controllers/TracksController.php b/controllers/TracksController.php
index 808ebe8..39bc390 100644
--- a/controllers/TracksController.php
+++ b/controllers/TracksController.php
@@ -77,8 +77,6 @@ class TracksController extends Controller
 			App::error404();
 		}
 
-		print_r($trackFile);
-
 		$gpxObject = simplexml_load_file(App::getBasedir().'tracks/track'.$trackFile->id.'.gpx');
 
 		$trip = Trips::model()->add(
diff --git a/public/js/map.js b/public/js/map.js
index 134506d..6013b02 100644
--- a/public/js/map.js
+++ b/public/js/map.js
@@ -595,7 +595,9 @@ function drawTrek(id)
 
 			if (typeof (data.wayPoints) != 'undefined') {
 				for (var i = 0; i < data.wayPoints.length; i++) {
-					L.marker([data.wayPoints[i]['lat'], data.wayPoints[i]['lng']], {icon: categories.marker, title: data.wayPoints[i]['name']}).addTo(myMap);
+					marker = L.marker([data.wayPoints[i]['lat'], data.wayPoints[i]['lng']], {icon: categories.marker, title: data.wayPoints[i]['name']})
+					marker.bindPopup('<b>' + data.wayPoints[i]['name'] + '</b><br/>' +data.wayPoints[i]['description']);
+					marker.addTo(myMap);
 				}
 			}
 		}