continued adding general case
finished adding extra cases, except for todo notes
edited most of the todos