* some more structural and skel changes