Addressed varioud TODOs