increased timeout
cleanup
fixed promise chaining.