Clip Fix

many edits