reorganizations + comptests
fixed some planning test statistics
more work