added some utils, cleanup, bootstrap commands