minor optimizations
improving lables...