edits

working edits from TK and TP