Makeing small changes

these changes sergested by comments