Small improvements and update to README.md