more edits and space opts