Updates for WoD and various fixes

Added support for WoD bait.
Various fixes addressing issues. Fixes #12 , fixes #13 and resolves #10