Misc updates
Minor revision.