minor bugfixes from changed variable names
minor bugfixes from changed variable names