Bug fixes in usage and update README