lots of small changes, started tackling struct inheritance
merge issues