changed popcornlib selectors and fixed some bugs