Improve readme and some minor api changes