Updated wishlist stuff, working pretty well now