Added even more variables
Updated notes
Updated output/expectations to be consistent