Small fixes.
Add really basic type interpretation.