Some sweeping changes i made five months ago.

I guess I never finished what appear to be large improvements that I made shortly after I released this gem.

I need to dive back in and pick up where I left off but I've made this PR for visibility.