Added comments and further fixes to typename checks

Signed-off-by: Wolfenswan <fridaynightsarekillingme+github@gmail.com>