improves unicorn receipt
updates data
fixes merge issues