Forest 2.4

More tweaks.