storage directory was missing + few tweaks