Fixed warnings of gcc and updated TODO.