Added .gitignore, TODO

Modified other files a bit as well.