further work on remaining-height helper #244 #490 #561