little design improvements