update todos, changing indenting and add welcome