added comments, TODO's and NOTE's