minor changes and tuning
rename some methods.  fix includes
adjusted includes to be more portable