lots of cleanup and style adjustments, gettings things ready for prime time