Updates Made the night of 10/2/13

Work was done by Robert and Emilio, starting from approximatley 10:52
and finishing at approximatley 12:43