Lots of updates

here they are.