Wrong bar height in pop by age tool + some adjustments and simplifications