add facility and performance fixes