did a first series of fixes, still a LOT of pointer issues.