fixed many problems with transfer etc