comments and set image fix