add run, few fixes