[enh] improved update mechanism; renamed few vars