lots o updates over today and last night that didn't get pushed