I have some bug fixings