Added chart add/delete/edit/comment; refactored wait for