Wishlist and Library updates

Massive updates to Library and Wishlist.