minor design corrections