clean-up and readme updates