diff --git a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
index 6788cfbd14..55c7cfd847 100644
--- a/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
+++ b/projects/clr/hipamd/include/hip/hcc_detail/hip_runtime_api.h
@@ -692,6 +692,8 @@ hipError_t hipEventRecord(hipEvent_t event, hipStream_t stream);
  *  the function will return immediately and the completion_future resources will be released later, when the hipDevice is synchronized.
  *
  * @see hipEventCreate, hipEventCreateWithFlags, hipEventQuery, hipEventSynchronize, hipEventRecord, hipEventElapsedTime
+ *
+ * @returns #hipSuccess
  */
 hipError_t hipEventDestroy(hipEvent_t event);
 
diff --git a/projects/clr/hipamd/src/hip_hcc.cpp b/projects/clr/hipamd/src/hip_hcc.cpp
index 4fcf427a3c..bdb0f869ba 100644
--- a/projects/clr/hipamd/src/hip_hcc.cpp
+++ b/projects/clr/hipamd/src/hip_hcc.cpp
@@ -277,7 +277,6 @@ void ihipStream_t::locked_waitEvent(hipEvent_t event)
 {
     LockedAccessor_StreamCrit_t crit(_criticalData);
 
-    // TODO - check state of event here:
     crit->_av.create_blocking_marker(event->_marker);
 }
 
@@ -706,11 +705,10 @@ hipError_t ihipDevice_t::initProperties(hipDeviceProp_t* prop)
     prop->clockRate *= 1000.0;   // convert Mhz to Khz.
     DeviceErrorCheck(err);
 
-    //uint64_t counterHz;
-    //err = hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP_FREQUENCY, &counterHz);
-    //DeviceErrorCheck(err);
-    //prop->clockInstructionRate = counterHz / 1000;
-    prop->clockInstructionRate = 100*1000; /* TODO-RT - hard-code until HSART has function to properly report clock */
+    uint64_t counterHz;
+    err = hsa_system_get_info(HSA_SYSTEM_INFO_TIMESTAMP_FREQUENCY, &counterHz);
+    DeviceErrorCheck(err);
+    prop->clockInstructionRate = counterHz / 1000;
 
     // Get Agent BDFID (bus/device/function ID)
     uint16_t bdf_id = 1;
@@ -718,7 +716,6 @@ hipError_t ihipDevice_t::initProperties(hipDeviceProp_t* prop)
     DeviceErrorCheck(err);
 
     // BDFID is 16bit uint: [8bit - BusID | 5bit - Device ID | 3bit - Function/DomainID]
-    // TODO/Clarify: cudaDeviceProp::pciDomainID how to report?
     // prop->pciDomainID =  bdf_id & 0x7;
     prop->pciDeviceID =  (bdf_id>>3) & 0x1F;
     prop->pciBusID =  (bdf_id>>8) & 0xFF;
@@ -789,7 +786,7 @@ hipError_t ihipDevice_t::initProperties(hipDeviceProp_t* prop)
     prop->arch.hasFloatAtomicAdd           = 0;
     prop->arch.hasGlobalInt64Atomics       = 1;
     prop->arch.hasSharedInt64Atomics       = 1;
-    prop->arch.hasDoubles                  = 1; // TODO - true for Fiji.
+    prop->arch.hasDoubles                  = 1; 
     prop->arch.hasWarpVote                 = 1;
     prop->arch.hasWarpBallot               = 1;
     prop->arch.hasWarpShuffle              = 1;
diff --git a/projects/clr/hipamd/util/vim/hip.vim b/projects/clr/hipamd/util/vim/hip.vim
index 17faecfdeb..b73066a786 100644
--- a/projects/clr/hipamd/util/vim/hip.vim
+++ b/projects/clr/hipamd/util/vim/hip.vim
@@ -177,8 +177,10 @@ syn keyword hipFlags hipMemcpyDeviceToDevice
 syn keyword hipFlags hipMemcpyDefault 
 syn keyword hipFlags hipReadModeElementType 
 syn keyword hipFlags hipSuccess 
+syn keyword hipFlags hipErrorNotReady 
 syn keyword hipFlags hipTextureType1D 
 
+
 syn keyword hipFlags hipHostMallocDefault
 syn keyword hipFlags hipHostMallocPortable
 syn keyword hipFlags hipHostMallocMapped