More work on salvage, added some extra checks and won't return stacks of items