updated comments and url parsing