updates
lots of small changes during use.