add various fixes