Halfway through fixing image sending bugs