fixed showing labels, and some spill bugs