Udpated some comments and added some 'TODO' items