Added some methods, removed others, added some comments about the general ThreadModel