added container highlighting, slight improvements in handling