added a few things to get essential working with salvage