bugs in checkmarks logic should be fixed