Minor comments + todos