Added b option, removed todo snippet.