added switchable cell labels (closes #76), also a bunch of tweaks and adjustments