merge old, minor updates