fixed build + improved element highlighting