Lotsa improvements on the transfer side