I have some bug fixes ...