Continued batch Class/Factor improvements and testing.