clean up. 30 sec time out.
fix a bug