Moving some stuff around and updating bootloader flag since the Viper has a bootloader.

...s a bootloader.