added nextLevel to cache_t
cleaned up aaron's poop
Merge branch 'local'