Fix checkbox
Trying to get that checkbox to check but no cigar
Merge small changes