some Design fixes