Lots of cleanup and fun logging as well. HTC support enabled. Someone please tell me if it works.