pulled form Rene
added things to note in paper and updated todo list to show those things more clearly
merge