Some bug fixes. 1 left.