various fix/update