A few last minute bugfixes and cache-up
A few last minute bugfixes and cache-up