0.6.a07

various fixes