Many minor updates here