RI: changes to bootrap implementation. fixing errors nad improving efficiency