Re: #4 few corrections and changes