improvements to bus stop framework