update
lots of updates and fixes