name changes and bug fixes