Initial Type Refactoring done
Finish up Type refactoring
Fix warnings in trans