Autopop Updates

Stuff was broken