Made some improvements.