cleaned up/fixed/swapped hall models