added missing layers and fixed refs