bug fixings.