Very minor cosmetic changes and updated TO DO