Yet more cleanup
README updates