added more comments, todo list