Kyle and Mark's fixes

layering and infinite punches fixed