Fix WOODEN stuff and some cleanup
Merge pull request #405 from Kenny9999/development

Fix WOODEN stuff and some cleanup