Fallback storage added
Comments added
Caches added. Project cleaned up