add bb alias, clean up more