Lots of nasty bug fixes. :P