fixing exposed bugs