trying to make things work in first boot, I don't know why it is different here than later :( trying several things
tidy up and fix. looks working now at firstboot time.