Fix map caching somewhat
add water bg