v6

various fixes