Some improvements according to Jishi comments