Fixed some problems with Thurston