JH - various update improvements