lots of small updates
this seems to work