Impove readme and minor fix