fixed two other small issues