Added a few comments and TODOs.