bugfixes.. mostly