comment out flip, minor changes