Fixed small error, added todo