commented out some unused stuff added auto conversion to __name__==