hw follow ups + clean bootstrap usage