Fix check/uncheck bug
Add comments