updates and fixes... framework fleshing out.