Lots of bookshelves!
Hide: CTM fixes

Why didn't I test before the commit?
Sunflower