added correlationId to message, created some error handling examples etc