Minor bug fixes. Should be pretty much good to go.