and some more tiny things...