Fix off by one
Use common file format
Fix copy-paste
Instrument more functions, increase sample points