Bug fixes and setting up transfer rake