Update with new help
Fix parents that are system_messages
Re-add the directive finding for when system_message types occur