Further updated wishlist with a few edits x