Closed TODOs and added comments