Fix shutdown, add bento options