more addonwall / wall rework