Some cleanups, added Forestry Still integration