some touches, and fixes.