some additions to makeType, some cleanup