stopwatch and collsion map update

not finished but updates