Fixed Storage manager and polished a bit Mad Road