wishlist implemented and minor fixes