edits to key vals; remove functions-*