[WIP] fix height calculations