intermediate edits
language cleanup, added to-do