small update to resolve some mistakes 

Due to the first 'complicated' conflict on this project, some mistakes
that needed to be fixed appeared. Moreover, this commit fixes some of
the high priority TODOS.