various changes - mostly half done - needs more work.