Ironing; syntax, logic edits