Added label skipping in graphs
Fixed some minor issues here and there