Fixed warnings all some TODOs