another update fix as well as cleanups