Fixing bugs and bringing wyf plugin up to scratch