Added more info to messages
Fixed conflict