multiple changes and bug fixes