RS2 flip and a few other fixes