fixing and editing