Add better comments and TODOs.