Agree that the Metro is relatively safe.

If you get a chance, check out Eastern Market.

When you are down by the cemetery, visit the USMC memorial, too. The 9/11 memorial at the Pentagon is another good place to visit. One of my favorite things to do is walk the Tidal Basin in the early morning---check out the FDR memorial, which is along the path.