more tiny tweaks