Various Windwalker and Feral edits