more changes, currently fixing bugs -- Fixed Flip works