cell caching fixed
some cleanups