Various bug fixes - latest Wonderflux version.

Update to current latest Wonderflux commit - https://github.com/Jonnyauk/Wonderflux/commit/6b705334b596b7c56a2e4530b3fc3057a82b3457