Update readme, minor bug fixes