Adding Time Elapsed Field and correcting some bugs.