Fixed checkboxes, improved missing data detection, other things

data adjustment definitely needs looking at though.