Flip working better
Marissas fixes
Marissa update