2.8.1.0-EXP-MAIN XML update

(Includes some fixes to the dev XML)