speed and facade fixes