Make sure version info is printed at the top.
Minor cleanup.