Clean
Clean
Optimizations and tests
Optimize error computation
Various tests