Bootloader improvements (WIP)