Fix WOODEN stuff and some cleanup