Do a bit more test
Minor updates