Updated some design issues.