fixed todos and logging statements