Added comments to Types and fixed some bad names