fix some minor design issues.