Added timeit decorator
Minor fixes