(MESS) excalibur : added 2nd drive, cleanup (nw)