fixed the checked attribute (checkmarks are now sticking to checkboxes) + cleanup