fixed chart dims
Merge branch 'develop' into experimental
counting for x and y separated