working edits

edits from tp and yoshitaka