Update readme, minor changes to other files