Update order and comments for custom variables