minor changes (again from a couple months ago)