Merge fizzix's gameplay changes