Incorporate feedback from Rise's issues

I changed lots of stuff based on issues that @riseriyo opened.
I think I actually changed this in the example test code given. That fix should be reverted with these changes.