some partial fixes