minor fixes: rename setup to bootstrap