Fixing bugs

Original code referenced private variable in places and public property
in other places, thus caused a mismatch when I moved the information to
be passed all the way down the method chain.