Fixing some TODOs and Added loggers