a few more updates.  not done yet.  more cleanup soon.