Fixed up some of the issues with the boot-loader option. It's still
broken, however it mostly works.