more WR bug fixes
Merge pull request #7 from danimrath/master

more WR bug fixes