Several fixes that get this branch working\!