General bugfixes and updates
Fix cache retrieval problems, implement Tool mods fully