major speed issue fixes, added caching