Bug fixes. Ever so slightly closer to being done.