more changes to core based on test results