Minor fixes, deleted some unnecessary stuff, added some To-do comments.