fixed self._pc error
updated todo
merged todo.md
fixed todo conflicts, again