fixed some cores. brought in fixes from
old repo.