Improve script/bootstrap