made a lot of bold changes, have not tested, next time I put a new sd card in the pi I need to test this