Added 'bind', removed TODOs, added some comments.