diff --git a/controllers/travelController.js b/controllers/travelController.js
index 19b13f8..c43776e 100644
--- a/controllers/travelController.js
+++ b/controllers/travelController.js
@@ -73,18 +73,18 @@ exports.addTravel = function(req, res) {
 exports.updateTravel = function(req, res) {
 	userModel.findOne({'token': req.headers['x-access-token']})
 	.exec(function(err, user){
-        if (err) return console.log(err);
-        console.log(user);
-        userModel.findOne({_id: user._id})
+        if (err) return res.send(500, err.message);
+        console.log(travel);
+        travelModel.findOne({_id: travel._id})
         .lean()
         .populate('travels', 'title from to date')
-        .exec(function (err, user) {
+        .exec(function (err, travel) {
             if (err) return res.send(500, err.message);
-            if (!user) {
-                res.json({success: false, message: 'User not found.'});
-            } else if (user) {
+            if (!travel) {
+                res.json({success: false, message: 'travel not found.'});
+            } else if (travel) {
 
-                res.status(200).jsonp(user);
+                res.status(200).jsonp(travel);
             }
         });
     });
@@ -92,21 +92,18 @@ exports.updateTravel = function(req, res) {
 
 //DELETE
 exports.deleteTravel = function(req, res) {
-	userModel.find({
-		token: req.headers['x-access-token']
-	}, function(err, users){
-		var user=users[0];
-
-		travelModel.findById(req.params.id, function(err, travel) {
-			if(travel.owner==user.username)
+	userModel.findOne({'token': req.headers['x-access-token']})
+	.exec(function(err, user){
+		if (err) return res.send(500, err.message);
+		travelModel.findById(req.params.travelid, function(err, travel) {
+			if (err) return res.send(500, err.message);
+			if(travel.user.equals(user._id))
 			{
 				travel.remove(function(err) {
 					if(err) return res.send(500, err.message);
 
-					travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
-							if(err) res.send(500, err.message);
-							res.status(200).jsonp(travels);
-					});
+					console.log("deleted");
+					exports.getAllTravels(req, res);
 				});
 			}
 		});
@@ -114,79 +111,89 @@ exports.deleteTravel = function(req, res) {
 };
 
 /* join */
-exports.addJoin = function(req, res) {
+exports.addJoinPetition = function(req, res) {
 	userModel.findOne({'token': req.headers['x-access-token']})
-	.exec(function(err, user){
-		travelModel.findById(req.params.travelId, function(err, travel){
-			console.log(travel.title);
-			var join = {
-				joinedUserId: user._id,
-				joinedUsername: user.username,
-				acceptedUserId: req.body.acceptedUserId,
-				joinedAvatar: user.avatar
-			};
-			travel.joins.push(join);
-
-
-
-			travel.save(function(err, travel) {
-				if(err) return res.send(500, err.message);
-		    //res.status(200).jsonp(travel);
-				travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
-				    if(err) res.send(500, err.message);
-						res.status(200).jsonp(travels);
-				});
+	.exec(function(err, userJoining){
+		if (err) return res.send(500, err.message);
+		if (!userJoining) {
+            res.json({success: false, message: 'User not found.'});
+        } else if (userJoining) {
+			travelModel.findOne({
+				_id: req.params.travelid,
+				user: {'$ne': userJoining._id},
+				joins: {'$ne': userJoining._id},
+				joinPetitions: {'$ne': userJoining._id}
+			})
+			.exec(function(err, travel){
+				if (err) return res.send(500, err.message);
+				if (!travel) {
+		            res.json({success: false, message: 'travel not found. You can not join a travel if you have created it, or if you have already joined'});
+		        } else if (travel) {
+					travel.joinPetitions.push(userJoining._id);
+					travel.save(function(err, travel) {
+						if(err) return res.send(500, err.message);
+
+						//start saving notification, get user owner of travel
+						userModel.findOne({_id: travel.user})
+						.exec(function(err, user){
+							if (err) return res.send(500, err.message);
+							if (!user) {
+					            res.json({success: false, message: 'User not found.'});
+					        } else if (user) {
+							//notification
+								var notification = {
+									type: "join",
+									message: "user "+userJoining.username+" joins your travel "+travel.title,
+									date: new Date(),
+									icon: 'join.png',
+									link: ""
+								};
+								user.notifications.push(notification);
+								user.save(function(err, user) {
+									if (err) return res.send(500, err.message);
+
+									console.log("notification saved");
+									exports.getTravelById(req, res);
+								});
+							}
+						});//end saving notification
+					});
+				}//end of else if travel
 			});
-
-			//start saving notification, get user owner of travel
-			userModel.find({
-		      username: travel.owner
-		  }, function(err, userowners) {
-				var userowner=userowners[0];
-				//notification
-				var notification = {
-					type: "join",
-					otherusername: user.username,
-					description: "user "+user.username+" joins your travel "+travel.title,
-					date: new Date(),
-					link: ""
-				};
-				userowner.notifications.push(notification);
-				userowner.save(function(err, userowner) {
-					console.log("notification saved");
-				});
-			});//end saving notification
-
-		});
-
+		}//end of else if user
 	});
 };
 
-exports.doUnjoin = function(req, res) {
-	userModel.find({
-		token: req.headers['x-access-token']
-	}, function(err, users){
-		var user=users[0];
-
-		travelModel.findById(req.params.travelId, function(err, travel){
-			for(var i=0; i<travel.joins.length; i++)
-			{
-				if(travel.joins[i].joinedUsername==user.username)
-				{
-					travel.joins.splice(i, 1);
+exports.unJoin = function(req, res) {
+	userModel.findOne({'token': req.headers['x-access-token']})
+	.exec(function(err, user){
+		if (!user) {
+            res.json({success: false, message: 'User not found.'});
+        } else if (user) {
+			travelModel.findOne({
+				_id: req.params.travelid,
+				joinPetitions: user._id
+			})
+			.exec(function(err, travel){
+				if (err) return res.send(500, err.message);
+				if (!travel) {
+		            res.json({success: false, message: 'can not unjoin this travel'});
+		        } else if (travel) {
+					for(var i=0; i<travel.joinPetitions.length; i++)
+					{
+						if(travel.joinPetitions[i].equals(user._id))
+						{
+							travel.joinPetitions.splice(i, 1);
+						}
+					}
+					travel.save(function(err, travel) {
+						if(err) return res.send(500, err.message);
+						exports.getTravelById(req, res);
+					});
 				}
-			}
-
-			travel.save(function(err, travel) {
-				if(err) return res.send(500, err.message);
-				//res.status(200).jsonp(travel);
-				travelModel.find({date: {$gte: new Date()}}, function(err, travels) {
-				    if(err) res.send(500, err.message);
-						res.status(200).jsonp(travels);
-				});
 			});
+		}
 
-		});
 	});
 };
 
diff --git a/controllers/userController.js b/controllers/userController.js
index 261c5f4..946427d 100644
--- a/controllers/userController.js
+++ b/controllers/userController.js
@@ -121,6 +121,21 @@ exports.getUserById = function (req, res) {
         }
     });
 };
+//GET - Return a User with specified ID
+exports.getUserByToken = function (req, res) {
+    userModel.findOne({'token': req.headers['x-access-token']})
+    .lean()
+    .populate('travels', 'title from to date')
+    .exec(function (err, user) {
+        if (err) return res.send(500, err.message);
+        if (!user) {
+            res.json({success: false, message: 'User not found.'});
+        } else if (user) {
+
+            res.status(200).jsonp(user);
+        }
+    });
+};
 
 exports.updateUser = function (req, res) {
     userModel.update({'token': req.headers['x-access-token']}, req.body,
diff --git a/models/travelModel.js b/models/travelModel.js
index d8b3e33..23e7af8 100644
--- a/models/travelModel.js
+++ b/models/travelModel.js
@@ -22,6 +22,10 @@ var travelSchema = new Schema({
         type: mongoose.Schema.Types.ObjectId,
         ref: 'userModel'
     }],
+    joinPetitions: [{
+        type: mongoose.Schema.Types.ObjectId,
+        ref: 'userModel'
+    }],
     comments: [{
         type: mongoose.Schema.Types.ObjectId,
         ref: 'commentModel'
diff --git a/models/userModel.js b/models/userModel.js
index 186ff45..3c40289 100644
--- a/models/userModel.js
+++ b/models/userModel.js
@@ -8,8 +8,8 @@ var userSchema = new Schema({
     username: { type: String, required: true, unique: true },
     password: { type: String, required: true, selected: false },
     token: { type: String, selected: false },
-    description:   { type: String },
-    avatar:   { type: String },
+    description:   { type: String, default: "Hello world" },
+    avatar:   { type: String, default: "racoon" },
     email:   { type: String, required: true },
     phone: { type: String },
     telegram: { type: String },
@@ -33,7 +33,7 @@ var userSchema = new Schema({
         ref: 'travelModel'
     }],
     notifications: [{
-        state: {type: String},//viewed, pendent
+        state: {type: String, default: "pendent"},//viewed, pendent
         message: {type: String},
         link: {type: String},//aquí oju, a la app i a la web calen links diferents, però ho podem fer posant sempre a la app i a la web el prefix del link (#!/app) o (#/app/), i després afegint-hi la pàgina on volem enviar el routing, per exemple (dashboard)
         icon: {type: String},
diff --git a/server.js b/server.js
index 828296e..6cb3506 100755
--- a/server.js
+++ b/server.js
@@ -106,19 +106,23 @@ apiRoutes.use(function(req, res, next) {
 }); //fi verificació de token
 
 
-apiRoutes.route('/users/:id')
-    .put(userCtrl.updateUser)
+apiRoutes.route('/users/getByToken')
+    .get(userCtrl.getUserByToken);
+apiRoutes.route('/users')//agafa l'user a partir del token
+    .put(userCtrl.updateUser)//no comprovat
     .delete(userCtrl.deleteUser);
 apiRoutes.route('/travels')
     .post(travelCtrl.addTravel);
-//FINS AQUÏ COMPROVAT
-apiRoutes.route('/travels/:id')
-    .put(travelCtrl.updateTravel)
+apiRoutes.route('/travels/modifyById/:travelid')
+    .put(travelCtrl.updateTravel)//no comprovat
     .delete(travelCtrl.deleteTravel);
+apiRoutes.route('/travels/join/:travelid')
+    .get(travelCtrl.addJoinPetition);
+apiRoutes.route('/travels/unjoin/:travelid')
+    .get(travelCtrl.unJoin);
+//FINS AQUÏ COMPROVAT
 
-apiRoutes.route('/travels/addJoin/:travelId')
-    .get(travelCtrl.getJoinsByTravelId);
-apiRoutes.route('/travels/comment/:travelId')
+apiRoutes.route('/travels/comment/:travelid')
     .get(travelCtrl.getCommentsByTravelId);
 
 /*apiRoutes.route('/travels/join/:travelId')
@@ -126,11 +130,11 @@ apiRoutes.route('/travels/comment/:travelId')
 apiRoutes.route('/travels/unjoin/:travelId')
     .post(travelCtrl.doUnjoin);*/
 
-apiRoutes.route('/travels/:travelId/join')
+/*apiRoutes.route('/travels/:travelId/join')
     .post(travelCtrl.addJoin);
 apiRoutes.route('/travels/:travelId/unjoin')
     .post(travelCtrl.doUnjoin);
-
+*/
 apiRoutes.route('/users/:userId/fav')
     .post(userCtrl.addFav);
 apiRoutes.route('/users/:userId/unfav')