Fix
Done
Fix csv
Fixed time problem