removed some comments. added some comments. added a few TODOs.