Removed some TODOs with regard to assist type recognition. Added some comments.