substantial bux fixes to exp branch.