text changes and bug fixes