Bugfixes

Did away with removing HMs on transfer; fixed error detection and fixed
Memory Residence for Gen6 transfer options.