re-enable some checks; update comments