Fixed broken register, some things for first acceptance test.