fixed some other small bugs