added some 'todo' comments + minor misc. changes