fixed urls, added comments, fixed login issue for favorites, merged normal and parallel version