Cleanup, some fixes

@hkal Process, lol.

![](http://media.tumblr.com/288de32730e899228f41241ae6361be5/tumblr_inline_mmd7fq6gGx1qz4rgp.gif)