Added some additional detail to the models for boss 1-2 and a carrier
merge branch master, using my temp file on my mac for the boss