fixed todos and small things