Tidy, fixes and initial inventory transfers work 2