fixed todoes