timeout to acceleration, various tuneup/fixes