minor beautifying tweaks.  Adding system headers