bug fixings...