better tick labels, cleanup