Refactored code a little - moved stuff around/removed some
warnings/changed some names.
Corrected Forestry Integration part.