Fixed timings, refactored and added tests, added strict mode