decorators: comments and minor fix