Updated some basic info and added some TODOs