just some bug fixes