minor bug fixes before final user studies.