small additional changes

should work now...