Fixing up some of the unlocking/viewing mechanics.