Minor cleanup and readme updates to reflect changes.