Clean up and readme updates