Correct runtime and some modifications