clean up name
add add/remove fav stops