Also make use of the all() method to clean up some code, and fix storage spoke some more. Tested on branched with a local compose and updates.img. -jlk