Fixes the type builtin error, corrects commented out lines