last essential fixes