Fixed double counting of auto-transfers plus tidy up