Add basic type checking; begin to add comment header.