more bus stops, tidy up