update todos
Merge branch 'master' into ui
fixing minor errors on home page
fixed JSON formatting / improved readability