resolved some warnings-todo