Added location and total score. fixed time