cleaned up todos and notes