Better naming of variables, altered debug printings.