General updates
Add better type scaling