thumbs + cosmetic fixes