More edits, added tasks