Added Forrestry again and some cleanups of config files and value changes