Some comments and @todo