Some fixes

re-ran on test env. Also, some outofout.pl fixes