better circle/line sizes, label size constant, some cleaning