More of artie's edits.