Added and removed some TODO's and removed a quick fix that was not needed anymore.