minor shorttcomings removed