MORE bug fixes. Holy cow.