Add comments and description