Made some improvements