increase waiting delay, cleanup, whitespace trim