Better caching and errors
Added more stats to match details