12/14/14 #2

Fixed call labels and little bugs.