further bootstrap improvements