various bootloader code
boot loader code.
fixing repo conflicts