Minor refactoring (name changes)
Minor  bugfixes