Forestry Conversion and content update

Lots of pretty changes here. Includes the GUI fix by Pat.