more buggies fixed