Upload 21

Minor changes