more small edits, added time estimates