misc. minor issues

Enjoy the 1.0 release dinner ;-)