more element updates; cleanup