Worked on transfers and other tidiness