Jsandrew improvements review

@jsandrew some more (very) small changes. I've gone through all the code now, and everything looks really nice functionally wise. Only thing left to do is to make spec tests pass. Will take a shot at that soon as well.

As always, let me know if you disagree with anything :).