Some updates to HC matching; fixed forgotten doubles for timeout and interval;