Add bookshelves and tidy up code for warps and kits