Radar fixes

Should be finished now