ACCUMULO-1000 fixed a lot of odds and ends