Incorporate feedback from Rise's issues

I changed lots of stuff based on issues that @riseriyo opened.