Fixed: Wrong labels (Setup dialog)
CS fixes + typo