Found another spot where there could be timing issues, and fixed it.
Trying to bring things back to where they were!
Reversed a few things that should have stayed but were taken out.
Merge pull request #9 from Jedwondle/master

Brought in changes from dshurt version.