(MESS) Some more devcb2 edits. (nw)