Added some more todo's and removed inaccurate information