a few little design changes