minor fixes
end2end test for facility working