Many tweaks to make this initial prod version