fixed checkboxes
random stuff
merge