locked all the rooms again, tweaking solar based on notes