More work toward 0.5.6

Two issues and also regen work is much improved.