more porting progress... down to 333 errors, 600 originally