minor shortcomings removed