add ext files, tidy up, run most tests