removed testing stuff, fixed args