Added T2000 support and fixed bugs