removed time from HUD
sonar working
fixed merge conflict?