Made some improvements to typrohrapy, etc..