Update readme and fix some issues