Fixed a bug and a todo