Fixed most of the defects reported by Greg.
Merge branch 'master' of https://github.com/zarate8/myWishList