diff --git a/gitclass b/gitclass
index 6e871fe..3774aeb 100755
--- a/gitclass
+++ b/gitclass
@@ -42,27 +42,49 @@ function remove_local_changes()
 	git clean -fd > /dev/null 2>&1
 }
 
-Bold="\e[1m"
-Normal="\e[0m"
-Black="\e[30m"
-Red="\e[31m"
-Green="\e[32m"
-Yellow="\e[33m"
-Blue="\e[34m"
-Magenta="\e[35m"
-Cyan="\e[36m"
-White="\e[37m"
 
-DarkGray="\e[90m"
-LightRed="\e[91m"
-LightGreen="\e[92m"
-LightYellow="\e[93m"
-LightBlue="\e[94m"
-LightMagenta="\e[95m"
-LightCyan="\e[96m"
-LightWhite="\e[97m"
+function WithColor() {	
+	Normal="\e[0m"
+	Bold="\e[1m"
+	Black="\e[30m"
+	White="\e[37m"
+	if [[ $1 == 0 ]]; then
+		Red=$Normal
+		Green=$Normal
+		Yellow=$Normal
+		Blue=$Normal
+		Magenta=$Normal
+		Cyan=$Normal
 
+		DarkGray=$Normal
+		LightRed=$Normal
+		LightGreen=$Normal
+		LightYellow=$Normal
+		LightBlue=$Normal
+		LightMagenta=$Normal
+		LightCyan=$Normal
+		LightWhite=$Normal
+	else
+		Red="\e[31m"
+		Green="\e[32m"
+		Yellow="\e[33m"
+		Blue="\e[34m"
+		Magenta="\e[35m"
+		Cyan="\e[36m"
+
+		DarkGray="\e[90m"
+		LightRed="\e[91m"
+		LightGreen="\e[92m"
+		LightYellow="\e[93m"
+		LightBlue="\e[94m"
+		LightMagenta="\e[95m"
+		LightCyan="\e[96m"
+		LightWhite="\e[97m"
+	fi
+}
 
+UU_HCHEVRONB="\U00AB"
+UU_HCHEVRONE="\U00BB"
 display(){
 	echo -en $*
 	echo -en ${Normal}
@@ -88,16 +110,31 @@ ClearLine(){
 	echo -en "\e[2K" 
 }
 
+class_prefix_from_file=''
+load_students(){
+	students_file=$(<students.lst)
+	student_array=( ${students_file} )
+	if [[ ${student_array[0]} = class* ]]; then
+		# look for first line in students file if its a class alias
+		class="${student_array[0]/class:/}"
+		class=$(trim $class)
+		class_prefix_from_file="${class}."		
+		student_array[0]=''	
+		student_count_delta=-1
+	fi
+}
+
 url=${COURSE_GIT_URL:-'github.com'}
 action='pull'
-depth=100000
+depth_flag=""
 ellapsed=5
+verbose=0
+color=1
 repo=${COURSE_GIT_REPO:-'work'}
 branch='master'
-verbose=0
-klass=''
+class_prefix=''
 
-while getopts ":hpc:vk::r:b:dit:" opt; do
+while getopts ":hpc:vk:u:r:b:dit:n" opt; do
   case ${opt} in
   	h ) display "${Bold}Usage:\t ${Normal}$0 ${Normal}[-h] | [-p | -c <depth> [-r <repo>]] [-v] [-i | -t <time>] [user [user]...]\n"
 		display "\t $0                       \t ${Red}pull${Normal} all repos\n"
@@ -105,12 +142,14 @@ while getopts ":hpc:vk::r:b:dit:" opt; do
 		display "${Bold}Options${Normal}\n"
 		display "\t -p           \t\t pull, this is the default\n"
 		display "\t -c <depth>   \t clone optionaly with depth\n"
-		display "\t -r <repo>    \t clone repo named repo\n"
-	  # display "\t -i                  Imemdiate, wait between action on repos\n"
-	  	display "\t -k <class>   \t\t class/course name. user will be class.user\n"
-		display "\t -d           \t\t Remove local repository\n"
-		display "\t -t n         \t\t Wait n seconds between actions on repos\n"
-		display "\t -v 	         \t\t Verbose mode\n"		
+		display "\t -r <repo>    \t git remote repo name, by default taken from $COURSE_GIT_REPO or defaulted to 'work'\n"
+	  # display "\t -i           \t immediate, no wait between actions on repos\n"
+	  	display "\t -k <class>   \t class/course name. user will be class.user\n"
+		display "\t -u <URL>   	 \t git base URL\n"
+		display "\t -d           \t\t remove local repository\n"
+		display "\t -t n         \t\t wait n seconds between actions on repos\n"
+		display "\t -v 	         \t\t verbose mode\n"
+		display "\t -n 	         \t\t no color\n"		
 		display "\t -h           \t\t help message\n"
 		exit 0
 		;;
@@ -118,14 +157,18 @@ while getopts ":hpc:vk::r:b:dit:" opt; do
     	;;
     c ) action="clone"
 		if [ $OPTARG != "" ]; then
-			depth=$OPTARG
+			depth_flag="--depth={$OPTARG}"
 		fi
 		;;
 	v ) verbose=1
     	;;
 	k)  klass_arg=1
 		if [ $OPTARG != "" ]; then
-			klass=$OPTARG
+			class_prefix="${OPTARG}."
+		fi
+		;;
+	u)  if [ $OPTARG != "" ]; then
+			url=$OPTARG
 		fi
 		;;
 	r)  if [ $OPTARG != "" ]; then
@@ -144,58 +187,58 @@ while getopts ":hpc:vk::r:b:dit:" opt; do
 			ellapsed=$OPTARG		
 		fi		
 		;; 
+	n ) color=0		
+		;; 
     \? ) echo "Invalid Option: -$OPTARG" 1>&2
       	exit 1
 		;;
   esac
 done
 
+if [ $verbose == 1  ]; then
+	ellapsed=6
+fi
+
+WithColor $color
 ClearScreen
 curdir=$PWD
 
 shift $((OPTIND -1))
-students=""
-while [ "$1" != "" ]; do
-	students="$students $1"
-	shift
-done
-
-students_file=$(<students.lst)
-student_array=( ${students_file} )
+students=$*
 
 student_count_delta=0
-if [[ "$klass_arg" == "1" ]]; then
-	class=klass
-elif [[ ${student_array[0]} = class* ]]; then
-	# look for first line in students file if its a class alias
-	class="${student_array[0]/class:/}"
-	class=$(trim $class)
-	class_prefix="${class}."		
-	student_array[0]=''	
-	student_count_delta=-1	
-elif [ -e class ]; then
-	# or read class name from file
-	class=$(<class)
-	class=$(trim $class)
-	class_prefix="${class}."		
-else
-	class=`basename "$PWD"`
-	class_prefix="${class}."
+if [ -z "$klass_arg" ]; then
+	if [ -e class ]; then
+		# or read class name from file
+		class=$(<class)
+		class=$(trim $class)
+		class_prefix="${class}."		
+	elif [ -e students.lst ]; then
+		load_students
+		class_prefix=$class_prefix_from_file
+	else
+		class=`basename "$PWD"`
+		class_prefix="${class}."
+	fi
 fi
 
 if [[ ! -z "${students// }" ]]; then	
 	student_array=( ${students} )
 	student_count=${#student_array[@]}
 else
+	if [ -z "${student_array}" ]; then
+		load_students
+	fi
 	student_count=${#student_array[@]}
 	student_count=$((student_count+student_count_delta))
 fi
 
-display "${Blue} Retrieving code updates for ${LightCyan}${repo}${Blue} from ${LightCyan}${student_count} ${Blue}students in class ${LightCyan}${class}${Blue}."
+display "${Blue} Retrieving code updates for ${LightCyan}${repo}${Blue} from ${LightCyan}${student_count} ${Blue}students in class ${LightCyan}${class_prefix}${Blue}"
 display "${LightBlue} [${LightYellow}\U2248 ${LightCyan}$(($student_count * $ellapsed))${Blue} seconds${LightBlue}]\n"
 
 curr=0
 skip=0
+
 for d in ${student_array[@]}; do	
 	d=$(trim $d)	
 	if [ "$d" == "" ];then		
@@ -215,9 +258,9 @@ for d in ${student_array[@]}; do
 		continue;
 	fi
 	if [ $action == 'clone' ] || [ ! -d "$d" ] || [ ! "$(ls -A $d)" ]; then
-		display "${LightRed} ✇ ${LightYellow}\U00AB${Cyan}cloning${LightYellow}\U00BB ${ticker} $d "
+		display "${Normal}${LightRed}✇ ${LightYellow}${UU_HCHEVRONB}${Cyan}cloning${LightYellow}\U00BB ${ticker} $d "
 		SaveCursor
-			git clone --depth=$depth git@$url:${class_prefix}$d/$repo.git $d > /dev/null 2> ${d}.log
+			git clone $depth_flag git@$url:${class_prefix}$d/$repo.git $d > /dev/null 2> ${d}.log
 			gitstatus=$?
 		RestoreCursor
 		if [ $gitstatus -eq 0 ]; then		
@@ -225,11 +268,11 @@ for d in ${student_array[@]}; do
 			rm ${d}.log
 		else			
 			display " ${Bold}${LightRed} 🔥 ${LightCyan}${repo}${LightRed}?\n"
-			echo -e "\ngit clone --depth=${depth} git@${url}:${class_prefix}${d}/${repo}.git ${d}" >> ${d}.log
+			echo -e "\ngit clone ${depth_flag} git@${url}:${class_prefix}${d}/${repo}.git ${d}" >> ${d}.log
 		fi
 	else
 		cd $d
-		display "${LightGreen} ✇ ${LightYellow}\U00AB${Cyan}pulling${LightYellow}\U00BB ${ticker} $d "				
+		display "${LightGreen}✇ ${LightYellow}\U00AB ${Cyan}pulling${LightYellow}\U00BB ${ticker} $d "				
 		SaveCursor		
 			display "\n"							
 			git stash > /dev/null 2>&1
@@ -249,8 +292,8 @@ for d in ${student_array[@]}; do
 			display "\033[${line};28r"
 			RestoreCursor
 			SaveCursor
-			git --no-pager log --graph --pretty='%Cred%h%Creset -%C(auto)%d%n %C(bold cyan) %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat -2
-			waitForLoop $ellapsed $curr $((student_count+1))		
+			git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%n %C(bold cyan) %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --stat -5
+			# waitForLoop $ellapsed $curr $((student_count+1))		
 			display "\033[;r"
 		fi
 		if (( $verbose != 1 )); then