forceUpdate, few cleanups