lots of minor changes, see fb message for list