#KJ-112 Move editing changes from the report back into K code. Implemented everything except the last point.