diff --git a/CHANGELOG b/CHANGELOG
index 51f40d2..ad7b4c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,34 +1,40 @@
 # RELEASE.MAJOR.MINOR
 
+1.7.3
+    Breaking changes:
+        - ext collections merged to cmc
+        - No more typedefs in code generated
+    Fast forwarded codecov
+
 1.7.2
-    - Added resize function to array based collections
-    - Added the following functions to hashtable based collections:
+    Added resize function to array based collections
+    Added the following functions to hashtable based collections:
         - load
         - full
-    - Added more assert macros utility
-    - Added plenty more tests
-    - Substituted impl_default_value / key by compound literals
-    - Removed unnecessary conditional input and output functions
-    - Minor fixes throughout the library
+    Added more assert macros utility
+    Added plenty more tests
+    Substituted impl_default_value / key by compound literals
+    Removed unnecessary conditional input and output functions
+    Minor fixes throughout the library
 
 1.7.1
-    - Added new assert macro cmc_assert_sorted
-    - Fixed some include guards for hashtables
-    - Moved the cmc string format to each file
-    - Renamed some list functions (sequence input/output)
-    - Renamed list and linkedlist functions push and pop to push_at and pop_at
+    Added new assert macro cmc_assert_sorted
+    Fixed some include guards for hashtables
+    Moved the cmc string format to each file
+    Renamed some list functions (sequence input/output)
+    Renamed list and linkedlist functions push and pop to push_at and pop_at
 
 1.7.0
-    - Removed FMOD (function modifier)
-    - Added CMC prefix to all macros defined within the library
+    Removed FMOD (function modifier)
+    Added CMC prefix to all macros defined within the library
 
 1.6.3
-    - Added iterator functions to all collections:
+    Added iterator functions to all collections:
         - iter_advance
         - iter_rewind
         - iter_go_to
-    - Added cmc prefix to the logging utility
-    - Integrated the assert utility with the test utility. Now any assertion that fails inside the unit test will trigger failure and is no longer needed to manually pass or fail tests.
+    Added cmc prefix to the logging utility
+    Integrated the assert utility with the test utility. Now any assertion that fails inside the unit test will trigger failure and is no longer needed to manually pass or fail tests.
 
 1.6.2
     Added new functions to all collections:
diff --git a/README.md b/README.md
index d8fc2eb..3975756 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 
 <p align="center">
     <a href="https://github.com/LeoVen/C-Macro-Collections/blob/master/LICENSE"><img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="License"/></a>
-    <a href="#"><img src="https://img.shields.io/badge/Version-v1.7.2-orange.svg" alt="Version"/></a>
+    <a href="#"><img src="https://img.shields.io/badge/Version-v1.7.3-orange.svg" alt="Version"/></a>
     <a href="https://travis-ci.org/LeoVen/C-Macro-Collections"><img src="https://travis-ci.org/LeoVen/C-Macro-Collections.svg?branch=master" alt="travis-ci"/></a>
     <a href="https://codecov.io/gh/LeoVen/C-Macro-Collections"><img src="https://codecov.io/gh/LeoVen/C-Macro-Collections/branch/master/graph/badge.svg" alt="codecov"/></a>
 </p>
diff --git a/TODO b/TODO
index 1a15ec5..011b64e 100644
--- a/TODO
+++ b/TODO
@@ -11,8 +11,8 @@ TODO
     [X] Add MultiSet
     [X] Add MultiMap
     [X] Add IntervalHeap
-    [/] Add SortedList
-    [/] Add BiDiMap
+    [X] Add SortedList
+    [X] Add BidiMap
 [/] Add functions
     [X] update       {hashmap, treemap, multimap}
     [X] set          {hashmap, treemap, multimap}
@@ -31,26 +31,37 @@ TODO
     [ ] serialize    {all}
     [ ] deserialize  {all}
 [ ] Callback utility
+[ ] Custom allocators
 [ ] Zip Iterators
 [ ] Statically Allocated Collections
+    [ ] BidiMap
     [ ] Deque
     [ ] HashMap
     [ ] HashSet
     [ ] Heap
+    [ ] IntervalHeap
     [ ] LinkedList
     [ ] List
+    [ ] MultiMap
+    [ ] MultiSet
     [~] Queue
+    [ ] SortedList
     [~] Stack
     [ ] TreeMap
     [ ] TreeSet
 [ ] Dev Collections
+    [ ] BidiMap
     [~] Deque
     [ ] HashMap
     [ ] HashSet
     [ ] Heap
+    [ ] IntervalHeap
     [ ] LinkedList
     [ ] List
+    [ ] MultiMap
+    [ ] MultiSet
     [ ] Queue
+    [ ] SortedList
     [ ] Stack
     [ ] TreeMap
     [ ] TreeSet
@@ -62,6 +73,5 @@ TODO
     [X] timer.h
 
 [ ] Optimizations
-    [ ] Hashtable insertion can avoid a call to impl_get_entry to check if a key already exists
     [ ] Use binary search to find optimum hashtable prime size inside impl_calculate_size
-
+    [ ] Optimize certain hashtable loops that use iterators but can simply use a normal loop