little design fixes