Bootloaders

Lots of cleanup for the post-install bootloader setup!