added more todo comments, items under consideration