Made the tododos better