less dom changes; bug fix