v7 various fixes/improvements