fixes for height and data handling