update with latest popcorn-app changes