fixes to waiting, logging for elements
merge