Type alias diagnostics

Fixes #54 
Fixes #58