SAPI growth chart data and some more fixes