Many minor updates and merges from old notes