Lots if minor updates