Fixed all transfer bugs

ready to be updated! :D