Updated running time analysis and such