Check kinds for type constructs and values
Update the TODO