Remove superfluous limit
Move the wcursor increment after the assert
Improve imports
Merge pull request #188 from trevorbernard/master

Various improvements