more tiny bug fixes