updated for clarity (hopefully) :)
updated todo/notes