more design corrections