fixed some small design errors