some little design fixes