updates

old from 2mx3 plus some 3f03 changes