Bloat of stuff. KD-Tree, some refactoring. OMG...