Minor code improvements. Updated TODO's. Updated package.json.