added more TODO items
added issues