Bootstrap: method trace and other things
Bootstrap: more small fixes