diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index 066e16b..e23d073 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -60,37 +60,25 @@ Template.registerHelper('overlayDim', (part) => {
 });
 
 Template.registerHelper('myClasses', () => {
-    var invalid = [];
-	  if (Meteor.user().profile.classes === undefined || Meteor.user().profile.classes.length === 0) {
+	if (Meteor.user().profile.classes === undefined || Meteor.user().profile.classes.length === 0) {
     		return [];
     } else {
-    		var array = [];
-    		var courses = Meteor.user().profile.classes;
-    		for(var i = 0; i < courses.length; i++) {
-            found = classes.findOne({_id:courses[i]});
-            // if (found !== undefined) {
-    			      array.push(found);
-    			      var thisWork = work.find({class: array.slice(-1)[0]}).fetch();
+		var array = [];
+		var courses = Meteor.user().profile.classes;
+		for(var i = 0; i < courses.length; i++) {
+        	found = classes.findOne({_id:courses[i]});
+	      	array.push(found);
+	      	var thisWork = work.find({class: courses[i]}).fetch();
 
-	    		      for(var j = 0; j < thisWork.length; j++) {
-	    			        thisWork[j].dueDate = getReadableDate(thisWork[j].dueDate);
-	    			        thisWork[j].typeColor = workColors[thisWork[j].type];
-    			      }
-    			      array[i].thisClassWork = thisWork;
-            // } else {
-            //     console.log("invalid");
-            //     invalid.push(i);
-            // }
-    		}
-        // for(var i = 0; i < invalid.length; i++) {
-        //     array.splice(invalid[i], 1);
-        //     courses.splice(invalid[i], 1);
-        // }
-        // userprofile = Meteor.user().profile;
-        // userprofile.classes = courses;
-        // Meteor.call("editProfile", userprofile);
-    		return array;
-    }
+	      	for(var j = 0; j < thisWork.length; j++) {
+		        thisWork[j].dueDate = getReadableDate(thisWork[j].dueDate);
+		        thisWork[j].typeColor = workColors[thisWork[j].type];
+	      	}
+	     	 array[i].thisClassWork = thisWork;
+        	console.log(array);
+    	}
+    	return array;
+    }	
 });
 
 Template.main.helpers({
diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js
index 83711b3..a6a4a33 100644
--- a/hourglass/client/profile/profile.js
+++ b/hourglass/client/profile/profile.js
@@ -95,7 +95,7 @@ Template.profile.helpers({
     avatar() {
         var dim = window.innerWidth * 1600 / 1920 * 0.16;
         if (Meteor.user().profile.avatar !== undefined) {
-            var pic = Meteor.user().profile.avatar + ".png";
+            var pic = Meteor.user().profile.avatar;;
         } else {
             var pic = "Avatars/" + (Math.floor(Math.random() * (11 - 1)) + 1).toString(); + ".png";
             currentprofile = Meteor.user().profile;
@@ -499,6 +499,7 @@ function getCreateFormData() {
     var stop;
     var form = document.getElementsByClassName("creInput");
     for (var i = 0; i < form.length; i++) {
+    	if(i === 1) continue;
         if (form[i].value === "") {
             form[i].focus();
             form[i].placeholder = "Missing field";
diff --git a/hourglass/server/main.js b/hourglass/server/main.js
index 0300f71..ca1b4b9 100644
--- a/hourglass/server/main.js
+++ b/hourglass/server/main.js
@@ -353,7 +353,7 @@ Meteor.methods({
             pass === found.code &&
             found.banned.indexOf(Meteor.userId()) === -1 &&
             prof.classes.indexOf(change) === -1) {
-
+            classes.update({_id: found._id}, {$set: {subscribers: found.subscribers + 1}});
             var current = Meteor.user().profile;
             current.classes.push(change);
             Meteor.users.update({